浏览代码

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

Don't hide out-of-memory during FBX import
Kim Kulling 2 年之前
父节点
当前提交
6392dbfe4d
共有 1 个文件被更改,包括 8 次插入0 次删除
  1. 8 0
      code/AssetLib/FBX/FBXDocument.cpp

+ 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));
             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) {
     catch(std::exception& ex) {
         flags &= ~BEING_CONSTRUCTED;
         flags &= ~BEING_CONSTRUCTED;
         flags |= FAILED_TO_CONSTRUCT;
         flags |= FAILED_TO_CONSTRUCT;