Browse Source

Check for null

Doron Adler 7 years ago
parent
commit
323d59c7aa
1 changed files with 5 additions and 3 deletions
  1. 5 3
      code/TriangulateProcess.cpp

+ 5 - 3
code/TriangulateProcess.cpp

@@ -105,8 +105,10 @@ void TriangulateProcess::Execute( aiScene* pScene)
     bool bHas = false;
     bool bHas = false;
     for( unsigned int a = 0; a < pScene->mNumMeshes; a++)
     for( unsigned int a = 0; a < pScene->mNumMeshes; a++)
     {
     {
-        if ( TriangulateMesh( pScene->mMeshes[ a ] ) ) {
-            bHas = true;
+        if (pScene->mMeshes[ a ]) {
+            if ( TriangulateMesh( pScene->mMeshes[ a ] ) ) {
+                bHas = true;
+            }
         }
         }
     }
     }
     if ( bHas ) {
     if ( bHas ) {
@@ -286,7 +288,7 @@ bool TriangulateProcess::TriangulateMesh( aiMesh* pMesh)
             // We project it onto a plane to get a 2d triangle.
             // We project it onto a plane to get a 2d triangle.
 
 
             // Collect all vertices of of the polygon.
             // Collect all vertices of of the polygon.
-            for (tmp = 0; tmp < max; ++tmp) {
+            for (tmp = 0; tmp < MIN(max,max_out+2); ++tmp) {
                 temp_verts3d[tmp] = verts[idx[tmp]];
                 temp_verts3d[tmp] = verts[idx[tmp]];
             }
             }