TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-09 07:20:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

C4458 declaration hides class member.

Browse source 
There are plenty more of these, but they should be fixed by revising the
names of members to start with m, instead of fixing the local violations.
There was a previous PR for that but it went badly. Will retry again one
day.
This commit is contained in:
Daniel Buckmaster 2015-07-23 20:08:12 +10:00
parent 5e2de608d5
commit e10b421641
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/math/mMatrix.h
View file

@ -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);
}

2
Engine/source/ts/loader/appMesh.h
View file

@ -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_