diff --git a/source/Irrlicht/CXMeshFileLoader.cpp b/source/Irrlicht/CXMeshFileLoader.cpp index 06cd1576..7782818a 100644 --- a/source/Irrlicht/CXMeshFileLoader.cpp +++ b/source/Irrlicht/CXMeshFileLoader.cpp @@ -557,7 +557,8 @@ bool CXMeshFileLoader::parseDataObjectFrame( CSkinnedMesh::SJoint *Parent ) Meshes.push_back(mesh); - return parseDataObjectMesh ( *mesh ); + if (!parseDataObjectMesh(*mesh)) + return false; } else { @@ -1145,7 +1146,7 @@ bool CXMeshFileLoader::parseDataObjectMeshVertexColors(SXMesh &mesh) } core::stringc tmp=getNextToken(); - if (tmp != ";") + if (tmp != ";" && tmp != ";;") { os::Printer::log("No finishing semicolon in Mesh Vertex Colors Array found in x file", ELL_WARNING); return false; diff --git a/source/Irrlicht/Irrlicht8.0.vcproj b/source/Irrlicht/Irrlicht8.0.vcproj index 110f39d0..fdf664b9 100644 --- a/source/Irrlicht/Irrlicht8.0.vcproj +++ b/source/Irrlicht/Irrlicht8.0.vcproj @@ -663,6 +663,10 @@ RelativePath=".\..\..\include\IMeshSceneNode.h" > + + @@ -1747,6 +1751,14 @@ RelativePath=".\CDMFLoader.h" > + + + + @@ -2168,6 +2180,26 @@ > + + + + + + + + + +