From 946b2f035485529e15dd4c4d29b1c3ab3597800e Mon Sep 17 00:00:00 2001 From: kimmi Date: Sat, 18 Feb 2012 18:03:39 +0000 Subject: [PATCH] Bugfix : Fix the extension check for the m3-loader. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1175 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/M3Importer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/M3Importer.cpp b/code/M3Importer.cpp index 1a4041a92..b256b2dce 100644 --- a/code/M3Importer.cpp +++ b/code/M3Importer.cpp @@ -75,7 +75,7 @@ bool M3Importer::CanRead( const std::string &rFile, IOSystem* /*pIOHandler*/, bo return SimpleExtensionCheck( rFile, M3Extension.c_str() ); } - return true; + return false; } // ------------------------------------------------------------------------------------------------ @@ -278,8 +278,8 @@ void M3Importer::convertToAssimp( const std::string& pFile, aiScene* pScene, DIV // Loop over the faces of the nodes unsigned int numFaces = ( pRegions[ i ].ofsIndices + pRegions[ i ].nIndices ) - pRegions[ i ].ofsIndices; aiMesh *pMesh = new aiMesh; - pMesh->mPrimitiveTypes = aiPrimitiveType_TRIANGLE; MeshArray.push_back( pMesh ); + //pMesh->mPrimitiveTypes = aiPrimitiveType_TRIANGLE; pMesh->mNumFaces = numFaces; pMesh->mFaces = new aiFace[ pMesh->mNumFaces ];