diff --git a/Engine/source/math/mMatrix.h b/Engine/source/math/mMatrix.h index f3899d0da..71a95946b 100644 --- a/Engine/source/math/mMatrix.h +++ b/Engine/source/math/mMatrix.h @@ -572,10 +572,10 @@ inline MatrixF operator * ( const MatrixF &m1, const MatrixF &m2 ) return temp; } -inline MatrixF& MatrixF::operator *= ( const MatrixF &m ) +inline MatrixF& MatrixF::operator *= ( const MatrixF &m1 ) { MatrixF tempThis(*this); - m_matF_x_matF(tempThis, m, *this); + m_matF_x_matF(tempThis, m1, *this); return (*this); } diff --git a/Engine/source/ts/loader/appMesh.h b/Engine/source/ts/loader/appMesh.h index dc6b193c6..f2fb7c25e 100644 --- a/Engine/source/ts/loader/appMesh.h +++ b/Engine/source/ts/loader/appMesh.h @@ -99,7 +99,7 @@ public: virtual bool isSkin() { return false; } virtual void lookupSkinData() = 0; - virtual void lockMesh(F32 t, const MatrixF& objectOffset) { } + virtual void lockMesh(F32 t, const MatrixF& objOffset) { } }; #endif // _APPMESH_H_