Merge branch 'master' into empty-string-style

2021-04-30 00:54:57 +02:00
parent f761dc72f4 96d0524fab
commit 0b92abe9b4
14 changed files with 64 additions and 20 deletions
--- a/code/PostProcessing/SortByPTypeProcess.cpp
+++ b/code/PostProcessing/SortByPTypeProcess.cpp
@@ -135,7 +135,9 @@ void SortByPTypeProcess::Execute(aiScene *pScene) {
    std::vector<unsigned int>::iterator meshIdx = replaceMeshIndex.begin();
    for (unsigned int i = 0; i < pScene->mNumMeshes; ++i) {
        aiMesh *const mesh = pScene->mMeshes[i];
-        ai_assert(0 != mesh->mPrimitiveTypes);
+        if (mesh->mPrimitiveTypes == 0) {
+            throw DeadlyImportError("Mesh with invalid primitive type: ", mesh->mName.C_Str());
+        }

        // if there's just one primitive type in the mesh there's nothing to do for us
        unsigned int num = 0;