Merge branch 'master' into cleanup_includes

2017-03-05 15:15:29 +01:00
parent e6dcad384a d402825d03
commit 8d27945619
29 changed files with 336 additions and 154 deletions
--- a/code/ASEParser.cpp
+++ b/code/ASEParser.cpp
@@ -1857,7 +1857,7 @@ void Parser::ParseLV3MeshCFaceListBlock(unsigned int iNumFaces, ASE::Mesh& mesh)
            ++filePtr;

            // Face entry
-            if (TokenMatch(filePtr,"MESH_CFACE" ,11))
+            if (TokenMatch(filePtr,"MESH_CFACE" ,10))
            {
                unsigned int aiValues[3];
                unsigned int iIndex = 0;