Merge branch 'assimp:master' into obj-gcc14-bug

assimp · May 24, 2024 · 4551cf6 · 4551cf6
2 parents d1c66da + 30466aa
commit 4551cf6
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/code/Common/Subdivision.cpp b/code/Common/Subdivision.cpp
@@ -524,7 +524,11 @@ void CatmullClarkSubdivider::InternSubdivide(
                                     }
                                 }
 
-                                ai_assert(adj[o] - moffsets[nidx].first < mp->mNumFaces);
+                                if (mp == nullptr) {
+                                    continue;
+                                }
+
+                                ai_assert(adj[o] - moffsets[nidx].first < mp->mNumFaces);                                
                                 const aiFace &f = mp->mFaces[adj[o] - moffsets[nidx].first];
                                 bool haveit = false;