From 4f6dbac919c794ba80dbdce4cb67ec11c30e507f Mon Sep 17 00:00:00 2001 From: Alexander Gessler Date: Sat, 21 Jul 2012 17:13:03 +0200 Subject: [PATCH] - fbx: prevent infinite recursion when resolving objects with cyclic references. --- code/FBXDocument.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/FBXDocument.cpp b/code/FBXDocument.cpp index 8326d921e..2fe90a5c1 100644 --- a/code/FBXDocument.cpp +++ b/code/FBXDocument.cpp @@ -404,6 +404,10 @@ LazyObject::~LazyObject() // ------------------------------------------------------------------------------------------------ const Object* LazyObject::Get() { + if(being_constructed) { + return NULL; + } + if (object.get()) { return object.get(); }