Merge branch 'master' into verboseLogging

2020-05-21 18:30:52 +02:00
parent 14692368d5 f940a37be6
commit ecfca1d5c5
78 changed files with 715 additions and 204 deletions
--- a/code/PostProcessing/FindInvalidDataProcess.cpp
+++ b/code/PostProcessing/FindInvalidDataProcess.cpp
@@ -124,7 +124,7 @@ void FindInvalidDataProcess::Execute(aiScene *pScene) {
        if (2 == result) {
            // remove this mesh
            delete pScene->mMeshes[a];
-            AI_DEBUG_INVALIDATE_PTR(pScene->mMeshes[a]);
+            pScene->mMeshes[a] = NULL;

            meshMapping[a] = UINT_MAX;
            continue;