Преглед на файлове

Added support for additional argument of update function to indicate it is not called from loading

Gyedo Jeon преди 15 години
родител
ревизия
5b6ae0cb75
променени са 2 файла, в които са добавени 4 реда и са изтрити 0 реда
  1. 1 0
      direct/src/leveleditor/ObjectGlobals.py
  2. 3 0
      direct/src/leveleditor/ObjectMgrBase.py

+ 1 - 0
direct/src/leveleditor/ObjectGlobals.py

@@ -49,3 +49,4 @@ TYPE_CONV = {PROP_INT: int, PROP_BOOL: bool, PROP_FLOAT: float, PROP_STR: str}
 ARG_NAME = '_arg_name'
 ARG_NAME = '_arg_name'
 ARG_VAL = '_arg_val' # value from UI
 ARG_VAL = '_arg_val' # value from UI
 ARG_OBJ = '_arg_object' # obj information data structure
 ARG_OBJ = '_arg_object' # obj information data structure
+ARG_NOLOADING = '_arg_noloading' # to indicate this call is not from loading a scene

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

@@ -513,6 +513,9 @@ class ObjectMgrBase:
                         undoKwargs[key] = obj
                         undoKwargs[key] = obj
                         objProp[propName] = val
                         objProp[propName] = val
                         kwargs[key] = obj
                         kwargs[key] = obj
+                    elif funcArgs[key] == OG.ARG_NOLOADING:
+                        kwargs[key] = fSelectObject
+                        undoKwargs[key] = fSelectObject
                     else:
                     else:
                         kwargs[key] = funcArgs[key]
                         kwargs[key] = funcArgs[key]
                         undoKwargs[key] = funcArgs[key]
                         undoKwargs[key] = funcArgs[key]