Browse Source

Made object with animDict property be animated when created

Gyedo Jeon 15 years ago
parent
commit
6790b4ce26

+ 3 - 0
direct/src/leveleditor/ObjectMgrBase.py

@@ -120,6 +120,9 @@ class ObjectMgrBase:
                         newobj = Actor(model)
                     except:
                         newobj = Actor(Filename.fromOsSpecific(model).getFullpath())
+                    if hasattr(objDef, 'animDict'):
+                        objDef.anims = objDef.animDict.get(model)
+                        
                 elif objDef.model is not None:
                     # since this obj is simple model let's load the model
                     if model is None:

+ 1 - 7
direct/src/leveleditor/ObjectPropertyUI.py

@@ -327,14 +327,8 @@ class ObjectPropertyUI(ScrolledPanel):
         if len(objDef.anims) > 0 or animList:
             if animList is None:
                 animist = objDef.anims
-
-            if '' not in animList:
-                animList.append('')
-            defaultAnim = obj[OG.OBJ_ANIM]
-            if defaultAnim is None:
-                defaultAnim = ''
                 
-            propUI = ObjectPropUICombo(self.lookPane, 'anim', defaultAnim, animList)
+            propUI = ObjectPropUICombo(self.lookPane, 'anim', obj[OG.OBJ_ANIM], animList)
             sizer.Add(propUI)            
 
             propUI.bindFunc(self.editor.objectMgr.onEnterObjectPropUI,