From be255e6bbdd51911199f30f82d5ee21489034d0b Mon Sep 17 00:00:00 2001 From: Darren Ranalli Date: Wed, 12 Jul 2006 18:18:28 +0000 Subject: [PATCH] fixed getDoIds (pass in getDo) --- direct/src/distributed/DoCollectionManager.py | 3 ++- direct/src/distributed/DoHierarchy.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/direct/src/distributed/DoCollectionManager.py b/direct/src/distributed/DoCollectionManager.py index c5e7173647..bd8b2073f0 100755 --- a/direct/src/distributed/DoCollectionManager.py +++ b/direct/src/distributed/DoCollectionManager.py @@ -97,7 +97,8 @@ class DoCollectionManager: for i in self.getDoIdList(parentId, zoneId, classType)] def getDoIdList(self, parentId, zoneId=None, classType=None): - return self._doHierarchy.getDoIds(parentId, zoneId, classType) + return self._doHierarchy.getDoIds(self.getDo, + parentId, zoneId, classType) def getOwnerViewDoList(self, classType): assert self.hasOwnerView() diff --git a/direct/src/distributed/DoHierarchy.py b/direct/src/distributed/DoHierarchy.py index b94f0e2c0f..e66f675834 100755 --- a/direct/src/distributed/DoHierarchy.py +++ b/direct/src/distributed/DoHierarchy.py @@ -24,7 +24,7 @@ class DoHierarchy: self._table = {} self._allDoIds = set() - def getDoIds(self, parentId, zoneId=None, classType=None): + def getDoIds(self, getDo, parentId, zoneId=None, classType=None): """ Moved from DoCollectionManager ============================== @@ -52,7 +52,7 @@ class DoHierarchy: if classType is not None: a = [] for doId in r: - obj = self.getDo(doId) + obj = getDo(doId) if isinstance(obj, classType): a.append(doId) r = a