From 1708bea71b6113725de1ca483849143955e2fde9 Mon Sep 17 00:00:00 2001 From: Gyedo Jeon Date: Mon, 12 Apr 2010 18:41:33 +0000 Subject: [PATCH] Fixed bugs in undoing object deletion --- direct/src/leveleditor/ActionMgr.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/direct/src/leveleditor/ActionMgr.py b/direct/src/leveleditor/ActionMgr.py index 3920afbb30..332ca68985 100755 --- a/direct/src/leveleditor/ActionMgr.py +++ b/direct/src/leveleditor/ActionMgr.py @@ -149,8 +149,8 @@ class ActionDeleteObj(ActionBase): uid, obj[OG.OBJ_MODEL], parentNP) - self.editor.objectMgr.updateObjectColor(objRGBA[0], objRGBA[1], objRGBA[2], objRGBA[3], uid) - self.editor.objectMgr.updateObjectProperties(uid, objProp) + self.editor.objectMgr.updateObjectColor(objRGBA[0], objRGBA[1], objRGBA[2], objRGBA[3], objNP) + self.editor.objectMgr.updateObjectProperties(objNP, objProp) objNP.setMat(self.objTransforms[uid]) while (len(self.hierarchy.keys()) > 0): @@ -229,8 +229,8 @@ class ActionDeleteObjById(ActionBase): uid, obj[OG.OBJ_MODEL], parentNP) - self.editor.objectMgr.updateObjectColor(objRGBA[0], objRGBA[1], objRGBA[2], objRGBA[3], uid) - self.editor.objectMgr.updateObjectProperties(uid, objProp) + self.editor.objectMgr.updateObjectColor(objRGBA[0], objRGBA[1], objRGBA[2], objRGBA[3], objNP) + self.editor.objectMgr.updateObjectProperties(objNP, objProp) objNP.setMat(self.objTransforms[uid]) while (len(self.hierarchy.keys()) > 0):