Commit 809e81ae authored by hybrid's avatar hybrid

Fix merge bug.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1107 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 48e009de
......@@ -219,11 +219,6 @@ namespace video
core::matrix4& getTextureMatrix(u32 i)
{
return TextureLayer[i].getTextureMatrix();
else // this should not happen
{
_IRR_DEBUG_BREAK_IF(true)
return TextureLayer[0].getTextureMatrix();
}
}
//! Gets the immutable texture transformation matrix for level i
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment