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

Merge pull request #1371 from eightyeight/vs2015-warnings-1

Browse source 
Random VS warnings
This commit is contained in:
Daniel Buckmaster 2015-07-25 10:55:45 +10:00
commit d91ec87d3e
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/console/compiler.h
View file

@ -310,7 +310,7 @@ protected:
U8 *data; ///< Allocated data (size is BlockSize) U8 *data; ///< Allocated data (size is BlockSize)
U32 size; ///< Bytes used in data U32 size; ///< Bytes used in data
CodeData *next; ///< Next block CodeData *next; ///< Next block
}; } CodeData;
/// @name Emitted code /// @name Emitted code
/// { /// {

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

@ -572,10 +572,10 @@ inline MatrixF operator * ( const MatrixF &m1, const MatrixF &m2 )
return temp; return temp;
} }
inline MatrixF& MatrixF::operator *= ( const MatrixF &m ) inline MatrixF& MatrixF::operator *= ( const MatrixF &m1 )
{ {
MatrixF tempThis(*this); MatrixF tempThis(*this);
m_matF_x_matF(tempThis, m, *this); m_matF_x_matF(tempThis, m1, *this);
return (*this); return (*this);
} }

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

@ -99,7 +99,7 @@ public:
virtual bool isSkin() { return false; } virtual bool isSkin() { return false; }
virtual void lookupSkinData() = 0; virtual void lookupSkinData() = 0;
virtual void lockMesh(F32 t, const MatrixF& objectOffset) { } virtual void lockMesh(F32 t, const MatrixF& objOffset) { }
}; };
#endif // _APPMESH_H_ #endif // _APPMESH_H_