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

Random VS warnings

Engine/source/console/compiler.h

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

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

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_