Fix merge bug.
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1107 dfc29bdd-3216-0410-991c-e03cc46cb475master
parent
48e009de8f
commit
809e81aec9
|
@ -219,11 +219,6 @@ namespace video
|
||||||
core::matrix4& getTextureMatrix(u32 i)
|
core::matrix4& getTextureMatrix(u32 i)
|
||||||
{
|
{
|
||||||
return TextureLayer[i].getTextureMatrix();
|
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
|
//! Gets the immutable texture transformation matrix for level i
|
||||||
|
|
Loading…
Reference in New Issue