From 5b6ae0cb753c0959786b82c080a711bc6980213a Mon Sep 17 00:00:00 2001 From: Gyedo Jeon Date: Wed, 24 Mar 2010 05:13:12 +0000 Subject: [PATCH] Added support for additional argument of update function to indicate it is not called from loading --- direct/src/leveleditor/ObjectGlobals.py | 1 + direct/src/leveleditor/ObjectMgrBase.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/direct/src/leveleditor/ObjectGlobals.py b/direct/src/leveleditor/ObjectGlobals.py index 8bc7855540..c889ee5659 100755 --- a/direct/src/leveleditor/ObjectGlobals.py +++ b/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_VAL = '_arg_val' # value from UI ARG_OBJ = '_arg_object' # obj information data structure +ARG_NOLOADING = '_arg_noloading' # to indicate this call is not from loading a scene diff --git a/direct/src/leveleditor/ObjectMgrBase.py b/direct/src/leveleditor/ObjectMgrBase.py index 768c0b570f..4225d172e3 100755 --- a/direct/src/leveleditor/ObjectMgrBase.py +++ b/direct/src/leveleditor/ObjectMgrBase.py @@ -513,6 +513,9 @@ class ObjectMgrBase: undoKwargs[key] = obj objProp[propName] = val kwargs[key] = obj + elif funcArgs[key] == OG.ARG_NOLOADING: + kwargs[key] = fSelectObject + undoKwargs[key] = fSelectObject else: kwargs[key] = funcArgs[key] undoKwargs[key] = funcArgs[key]