From 6d1c202f0df86b2ceb6c84a2b2840ecc9f4a18bc Mon Sep 17 00:00:00 2001
From: Mark Mine <mark.mine@disney.com>
Date: Fri, 28 Mar 2003 02:00:35 +0000
Subject: [PATCH] *** empty log message ***

---
 direct/src/directtools/DirectLights.py |  5 +----
 direct/src/tkpanels/MopathRecorder.py  | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/direct/src/directtools/DirectLights.py b/direct/src/directtools/DirectLights.py
index 8b0a9e0b8e..d5ded77ac7 100644
--- a/direct/src/directtools/DirectLights.py
+++ b/direct/src/directtools/DirectLights.py
@@ -24,12 +24,9 @@ class DirectLight(NodePath):
         return self.light
 
 class DirectLights(NodePath):
-    def __init__(self, parent = None):
+    def __init__(self, parent = render):
         # Initialize the superclass
         NodePath.__init__(self)
-        # Use direct.group as default parent
-        if parent == None:
-            parent = direct.group
         # Create a node for the lights
         self.assign(parent.attachNewNode('DIRECT Lights'))
         # Create a light attrib
diff --git a/direct/src/tkpanels/MopathRecorder.py b/direct/src/tkpanels/MopathRecorder.py
index 01bca3ae6d..7773889049 100644
--- a/direct/src/tkpanels/MopathRecorder.py
+++ b/direct/src/tkpanels/MopathRecorder.py
@@ -73,6 +73,8 @@ class MopathRecorder(AppShell, PandaObject):
         self.playbackMarker = loader.loadModel('models/misc/smiley')
         self.playbackMarker.setName('Playback Marker')
         self.playbackMarker.reparentTo(self.recorderNodePath)
+        self.playbackMarkerIds = self.getChildIds(
+            self.playbackMarker.getChild(0))
         self.playbackMarker.hide()
         # Tangent marker
         self.tangentGroup = self.playbackMarker.attachNewNode('Tangent Group')
@@ -82,6 +84,8 @@ class MopathRecorder(AppShell, PandaObject):
         self.tangentMarker.setScale(0.5)
         self.tangentMarker.setColor(1,0,1,1)
         self.tangentMarker.setName('Tangent Marker')
+        self.tangentMarkerIds = self.getChildIds(
+            self.tangentMarker.getChild(0))
         self.tangentLines = LineNodePath(self.tangentGroup)
         self.tangentLines.setColor(VBase4(1,0,1,1))
         self.tangentLines.setThickness(1)
@@ -656,9 +660,10 @@ class MopathRecorder(AppShell, PandaObject):
         marker if subnode selected
         """
         taskMgr.remove(self.name + '-curveEditTask')
-        if nodePath.id() == self.playbackMarker.getChild(0).id():
+        print nodePath.id()
+        if nodePath.id() in self.playbackMarkerIds:
             direct.select(self.playbackMarker)
-        elif nodePath.id() == self.tangentMarker.getChild(0).id():
+        elif nodePath.id() in self.tangentMarkerIds:
             direct.select(self.tangentMarker)
         elif nodePath.id() == self.playbackMarker.id():
             self.tangentGroup.show()
@@ -671,6 +676,13 @@ class MopathRecorder(AppShell, PandaObject):
         else:
             self.tangentGroup.hide()
 
+    def getChildIds(self, nodePath):
+        ids = [nodePath.id()]
+        kids = nodePath.getChildrenAsList()
+        for kid in kids:
+            ids += self.getChildIds(kid)
+        return ids
+
     def deselectedNodePathHook(self, nodePath):
         """
         Hook called upon deselection of a node path used to select playback