From acd4d5ed46102082c0f04f1b6f69dc78f3ae438b Mon Sep 17 00:00:00 2001 From: Gyedo Jeon Date: Tue, 13 Apr 2010 23:39:21 +0000 Subject: [PATCH] Added handling of model loading failure --- direct/src/leveleditor/ObjectMgrBase.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/direct/src/leveleditor/ObjectMgrBase.py b/direct/src/leveleditor/ObjectMgrBase.py index 7d9259fc24..d7472a77d9 100755 --- a/direct/src/leveleditor/ObjectMgrBase.py +++ b/direct/src/leveleditor/ObjectMgrBase.py @@ -121,7 +121,7 @@ class ObjectMgrBase: try: newobj = loader.loadModel(model) except: - newobj = loader.loadModel(Filename.fromOsSpecific(model).getFullpath()) + newobj = loader.loadModel(Filename.fromOsSpecific(model).getFullpath(), okMissing=True) else: newobj = hidden.attachNewNode(objDef.name) else: @@ -371,7 +371,9 @@ class ObjectMgrBase: objRGBA = obj[OG.OBJ_RGBA] # load new model - newobj = loader.loadModel(model) + newobj = loader.loadModel(model, okMissing=True) + if newobj is None: + return newobj.setTag('OBJRoot','1') # reparent children