Merge pull request #813 from tgoulart/obj_loader_leak

Fix memory leak in OBJ loader when a mesh has no faces.
2016-03-04 16:41:57 +01:00 · 2016-03-04 16:41:57 +01:00 · 80f4e69938
parent f774bde20b 3c9e57fd73
commit 80f4e69938
1 changed files with 5 additions and 1 deletions
--- a/code/ObjFileImporter.cpp
+++ b/code/ObjFileImporter.cpp
@ -308,7 +308,11 @@ aiMesh *ObjFileImporter::createTopology( const ObjFile::Model* pModel, const Obj
    if( !pObjMesh ) {
        return NULL;
    }
-    ai_assert( NULL != pObjMesh );
+
+    if( pObjMesh->m_Faces.empty() ) {
+        return NULL;
+    }
+
    aiMesh* pMesh = new aiMesh;
    if( !pObjMesh->m_name.empty() ) {
        pMesh->mName.Set( pObjMesh->m_name );