From 92de1874a12419295350944986277a7dda4e4f79 Mon Sep 17 00:00:00 2001 From: David Vierra Date: Mon, 16 Mar 2015 14:14:26 -1000 Subject: [PATCH] destroyLists -> destroy, explicit None checks in scene/rendergraph --- src/mcedit2/rendering/rendergraph.py | 11 +++++------ src/mcedit2/rendering/scenegraph.py | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/mcedit2/rendering/rendergraph.py b/src/mcedit2/rendering/rendergraph.py index fc500e5..d189aad 100644 --- a/src/mcedit2/rendering/rendergraph.py +++ b/src/mcedit2/rendering/rendergraph.py @@ -37,10 +37,10 @@ class RenderNode(object): @parent.setter def parent(self, value): - if value: + if value is not None: self._parent = weakref.ref(value) else: - self._parent = value + self._parent = None def addChild(self, node): self.children.append(node) @@ -112,12 +112,11 @@ class RenderNode(object): def drawSelf(self): pass - def destroyLists(self): + def destroy(self): for child in self.children: - child.destroyLists() + child.destroy() self.displayList.destroy() - class RenderstateRenderNode(RenderNode): def draw(self): self.enter() @@ -374,7 +373,7 @@ def updateChildren(renderNode): for dc in deadChildren: renderNode.removeChild(dc) - dc.destroyLists() + dc.destroy() for index, sceneChild in enumerate(sceneNode.children): renderChild = renderNode.childrenBySceneNode.get(sceneChild) diff --git a/src/mcedit2/rendering/scenegraph.py b/src/mcedit2/rendering/scenegraph.py index f7e9ef2..aa1cba3 100644 --- a/src/mcedit2/rendering/scenegraph.py +++ b/src/mcedit2/rendering/scenegraph.py @@ -28,15 +28,15 @@ class Node(object): _parent = None @property def parent(self): - if self._parent: + if self._parent is not None: return self._parent() @parent.setter def parent(self, value): - if value: + if value is not None: self._parent = weakref.ref(value) else: - self._parent = value + self._parent = None def touchChildren(self): node = self