From ccee14a50be16d836d1a2ea98c828aab7d8352d2 Mon Sep 17 00:00:00 2001 From: Gyedo Jeon Date: Tue, 1 Jun 2010 20:52:57 +0000 Subject: [PATCH] Fixed a bug in flatten function definition --- direct/src/leveleditor/ObjectMgrBase.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/direct/src/leveleditor/ObjectMgrBase.py b/direct/src/leveleditor/ObjectMgrBase.py index 2316be4262..b348a43967 100755 --- a/direct/src/leveleditor/ObjectMgrBase.py +++ b/direct/src/leveleditor/ObjectMgrBase.py @@ -220,6 +220,13 @@ class ObjectMgrBase: else: return self.objects[uid] + def findObjectByNodePathBelow(self, nodePath): + for ancestor in nodePath.getAncestors(): + if ancestor.hasTag('OBJRoot'): + return self.findObjectByNodePath(ancestor) + + return None + def findObjectsByTypeName(self, typeName): results = [] for uid in self.objects.keys(): @@ -768,7 +775,7 @@ class ObjectMgrBase: newobj = self.addNewObject(typeName, uid, parent=parentNP, fSelectObject=False) newobj.setMat(mat) - def flatten(self, newobjModel, objDef, uid): + def flatten(self, newobjModel, model, objDef, uid): # override this to flatten models pass