From 4acdfddc4496bd172a08309dd59039bbdef9b1d1 Mon Sep 17 00:00:00 2001
From: Joe Shochet <shochet@gmail.com>
Date: Tue, 21 Nov 2006 21:38:45 +0000
Subject: [PATCH] fixed circular ref with setGeomNode, added warning for
 removeNode being called before cleanup

---
 direct/src/actor/Actor.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/direct/src/actor/Actor.py b/direct/src/actor/Actor.py
index c97a36e11b..e3efd0b2a1 100644
--- a/direct/src/actor/Actor.py
+++ b/direct/src/actor/Actor.py
@@ -177,7 +177,7 @@ class Actor(DirectObject, NodePath):
                 # the root.
                 root = PandaNode('actor')
                 self.assign(NodePath(root))
-                self.setGeomNode(self)
+                self.setGeomNode(NodePath(self))
 
             else:
                 # A standard Actor has a ModelNode at the root, and
@@ -445,6 +445,11 @@ class Actor(DirectObject, NodePath):
         if not self.isEmpty():
             self.removeNode()
 
+    def removeNode(self):
+        if self.__geomNode:
+            self.notify.warning("called actor.removeNode() on %s without calling cleanup()" % self.getName())
+        NodePath.removeNode(self)
+
     def flush(self):
         """
         Actor flush function