From 88afd02c4ed13f24be41919cba0c16fb37f7993c Mon Sep 17 00:00:00 2001
From: Joe Shochet <shochet@gmail.com>
Date: Fri, 1 Jun 2001 05:55:15 +0000
Subject: [PATCH] *** empty log message ***

---
 direct/src/showbase/ShowBase.py       | 20 ++++++++++++++++++++
 direct/src/showbase/ShowBaseGlobal.py | 18 ------------------
 direct/src/task/Task.py               |  1 +
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/direct/src/showbase/ShowBase.py b/direct/src/showbase/ShowBase.py
index caa196639b..ec4c6d63b6 100644
--- a/direct/src/showbase/ShowBase.py
+++ b/direct/src/showbase/ShowBase.py
@@ -58,6 +58,7 @@ class ShowBase:
                                        ColorAttribute())
         self.renderTop = NodePath(NamedNode('renderTop'))
         self.render = self.renderTop.attachNewNode('render')
+        
         self.hidden = NodePath(NamedNode('hidden'))
         # This will be the list of cameras, one per display region
         # For now, we only have one display region, so just create the
@@ -182,9 +183,28 @@ class ShowBase:
         # Transition effects (fade, iris, etc)
         self.transitions = Transitions.Transitions(self.loader)
 
+        import __builtin__
+        __builtin__.base = self
+        __builtin__.render2d = self.render2d
+        __builtin__.aspect2d = self.aspect2d
+        __builtin__.render = self.render
+        __builtin__.hidden = self.hidden
+        __builtin__.camera = self.camera
+        __builtin__.loader = self.loader
+        __builtin__.taskMgr = self.taskMgr
+        __builtin__.eventMgr = self.eventMgr
+        __builtin__.messenger = self.messenger
+        __builtin__.config = self.config
+        __builtin__.run = self.run
+
         # Tk
         if self.wantTk:
             import TkGlobal
+        if self.wantDIRECT:
+            import DirectSession
+            direct.enable()
+        else:
+            __builtin__.direct = self.direct = None
 
         self.restart()
 
diff --git a/direct/src/showbase/ShowBaseGlobal.py b/direct/src/showbase/ShowBaseGlobal.py
index 6756cb820f..9ad7247766 100644
--- a/direct/src/showbase/ShowBaseGlobal.py
+++ b/direct/src/showbase/ShowBaseGlobal.py
@@ -6,28 +6,10 @@ import __builtin__
 __builtin__.base = ShowBase()
 
 # Make some global aliases for convenience
-__builtin__.render2d = base.render2d
-__builtin__.aspect2d = base.aspect2d
-__builtin__.render = base.render
-__builtin__.hidden = base.hidden
-__builtin__.camera = base.camera
-__builtin__.loader = base.loader
 __builtin__.ostream = Notify.out()
 __builtin__.run = base.run
-__builtin__.taskMgr = base.taskMgr
-__builtin__.eventMgr = base.eventMgr
-__builtin__.messenger = base.messenger
-__builtin__.config = base.config
 __builtin__.directNotify = directNotify
 
-# Initialize DIRECT
-if base.wantDIRECT:
-    from DirectSession import *
-    direct.enable()
-else:
-    # Otherwise set the values to None
-    __builtin__.direct = base.direct = None
-
 # Set direct notify categories now that we have config
 directNotify.setDconfigLevels()
 
diff --git a/direct/src/task/Task.py b/direct/src/task/Task.py
index 819c63b288..2a59cc3af3 100644
--- a/direct/src/task/Task.py
+++ b/direct/src/task/Task.py
@@ -305,6 +305,7 @@ class TaskManager:
     def doMethodLater(self, delayTime, func, taskName):
         task = Task(func)
         seq = doLater(delayTime, task, taskName)
+        seq.laterTask = task
         return self.spawnTaskNamed(seq, 'doLater-' + taskName)
 
     def removeAllTasks(self):