Bläddra i källkod

Added handling of model loading failure

Gyedo Jeon 15 år sedan
förälder
incheckning
acd4d5ed46
1 ändrade filer med 4 tillägg och 2 borttagningar
  1. 4 2
      direct/src/leveleditor/ObjectMgrBase.py

+ 4 - 2
direct/src/leveleditor/ObjectMgrBase.py

@@ -121,7 +121,7 @@ class ObjectMgrBase:
                     try:
                     try:
                         newobj = loader.loadModel(model)
                         newobj = loader.loadModel(model)
                     except:
                     except:
-                        newobj = loader.loadModel(Filename.fromOsSpecific(model).getFullpath())
+                        newobj = loader.loadModel(Filename.fromOsSpecific(model).getFullpath(), okMissing=True)
                 else:
                 else:
                     newobj = hidden.attachNewNode(objDef.name)
                     newobj = hidden.attachNewNode(objDef.name)
             else:
             else:
@@ -371,7 +371,9 @@ class ObjectMgrBase:
             objRGBA = obj[OG.OBJ_RGBA]
             objRGBA = obj[OG.OBJ_RGBA]
             
             
             # load new model
             # load new model
-            newobj = loader.loadModel(model)
+            newobj = loader.loadModel(model, okMissing=True)
+            if newobj is None:
+                return
             newobj.setTag('OBJRoot','1')
             newobj.setTag('OBJRoot','1')
 
 
             # reparent children
             # reparent children