浏览代码

Fixed a bug of overriding objDef.anims with wrong animDict values

Gyedo Jeon 15 年之前
父节点
当前提交
140d0ab80b
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      direct/src/leveleditor/ObjectMgrBase.py

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

@@ -123,7 +123,7 @@ class ObjectMgrBase:
                         newobj = Actor(model)
                         newobj = Actor(model)
                     except:
                     except:
                         newobj = Actor(Filename.fromOsSpecific(model).getFullpath())
                         newobj = Actor(Filename.fromOsSpecific(model).getFullpath())
-                    if hasattr(objDef, 'animDict'):
+                    if hasattr(objDef, 'animDict') and objDef.animDict != {}:
                         objDef.anims = objDef.animDict.get(model)
                         objDef.anims = objDef.animDict.get(model)
                         
                         
                 elif objDef.model is not None:
                 elif objDef.model is not None:
@@ -144,6 +144,7 @@ class ObjectMgrBase:
                     newobj = hidden.attachNewNode(objDef.name)
                     newobj = hidden.attachNewNode(objDef.name)
             else:
             else:
                 newobj = nodePath
                 newobj = nodePath
+
             i = 0
             i = 0
             for i in range(len(objDef.anims)):
             for i in range(len(objDef.anims)):
                 animFile = objDef.anims[i]
                 animFile = objDef.anims[i]