2
0
Эх сурвалжийг харах

Merge pull request #4801 from jakrams/fbx-out-of-memory-fix

Don't hide out-of-memory during FBX import
Kim Kulling 2 жил өмнө
parent
commit
6392dbfe4d

+ 8 - 0
code/AssetLib/FBX/FBXDocument.cpp

@@ -199,6 +199,14 @@ const Object* LazyObject::Get(bool dieOnError) {
             object.reset(new AnimationCurveNode(id,element,name,doc));
         }
     }
+    catch (std::bad_alloc&) {
+        // out-of-memory is unrecoverable and should always lead to a failure
+
+        flags &= ~BEING_CONSTRUCTED;
+        flags |= FAILED_TO_CONSTRUCT;
+
+        throw;
+    }
     catch(std::exception& ex) {
         flags &= ~BEING_CONSTRUCTED;
         flags |= FAILED_TO_CONSTRUCT;