mirror of
https://github.com/panda3d/panda3d.git
synced 2025-09-27 07:03:36 -04:00
direct: Backport assorted fixes from master
This commit is contained in:
parent
6cfa73d268
commit
79ba760319
@ -1,7 +1,5 @@
|
|||||||
|
|
||||||
from panda3d.core import *
|
|
||||||
|
|
||||||
# Leave these imports in, they may be used by ptf files.
|
# Leave these imports in, they may be used by ptf files.
|
||||||
|
from panda3d.core import *
|
||||||
from panda3d.physics import *
|
from panda3d.physics import *
|
||||||
from . import Particles
|
from . import Particles
|
||||||
from . import ForceGroup
|
from . import ForceGroup
|
||||||
|
@ -1827,7 +1827,7 @@ class DelayedCall:
|
|||||||
self._removeDoLater()
|
self._removeDoLater()
|
||||||
def finish(self):
|
def finish(self):
|
||||||
if not self._finished:
|
if not self._finished:
|
||||||
self._doCallback()
|
self._doCallback(None)
|
||||||
self.destroy()
|
self.destroy()
|
||||||
def _addDoLater(self):
|
def _addDoLater(self):
|
||||||
taskMgr.doMethodLater(self._delay, self._doCallback, self._taskName)
|
taskMgr.doMethodLater(self._delay, self._doCallback, self._taskName)
|
||||||
|
@ -44,7 +44,8 @@ class TaskThreaded:
|
|||||||
self.ignoreAll()
|
self.ignoreAll()
|
||||||
|
|
||||||
def getTimeslice(self):
|
def getTimeslice(self):
|
||||||
return self.___timeslice
|
return self.__timeslice
|
||||||
|
|
||||||
def setTimeslice(self, timeslice):
|
def setTimeslice(self, timeslice):
|
||||||
self.__timeslice = timeslice
|
self.__timeslice = timeslice
|
||||||
|
|
||||||
|
@ -219,7 +219,7 @@ class SequenceInspector(Inspector):
|
|||||||
if partNumber == 0:
|
if partNumber == 0:
|
||||||
return self.object
|
return self.object
|
||||||
index = self.privatePartNumber(partNumber)
|
index = self.privatePartNumber(partNumber)
|
||||||
if type(index) == IntType:
|
if isinstance(index, int):
|
||||||
return self.object[index]
|
return self.object[index]
|
||||||
else:
|
else:
|
||||||
return getattr(self.object, index)
|
return getattr(self.object, index)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user