revert accidental checkin

direct/src/actor/Actor.py

@@ -308,6 +308,7 @@ class Actor(DirectObject, NodePath):
             else:
                 # just copy these to ourselve
                 otherCopy = other.copyTo(self)
+            self.setGeomNode(otherCopy.getChild(0))
 
             # copy the part dictionary from other
             self.__copyPartBundles(other)

direct/src/interval/LerpInterval.py

@@ -6,7 +6,6 @@ from pandac.PandaModules import *
 from direct.directnotify.DirectNotifyGlobal import *
 import Interval
 from direct.showbase import LerpBlendHelpers
-import profile, pstats
 
 #
 # Most of the intervals defined in this module--the group up here at
@@ -635,15 +634,6 @@ class LerpFunctionInterval(Interval.Interval):
         # Initialize superclass
         Interval.Interval.__init__(self, name, duration)
 
-    def _privStep(self, t):
-        profile.runctx('self._privStep(t)', globals(), locals(), 't.prof')
-        print "LerpFunctionInterval %s" % (self.function.__name__)
-        s = pstats.Stats('t.prof')
-        s.sort_stats('time')
-        #s.sort_stats('cumulative')
-        s.print_stats(5)
-        self.privStep = self._privStep
-
     def privStep(self, t):
         # Evaluate the function
         if (t >= self.duration):