RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpdb - fix argument overrides for bpGroup

This commit is contained in:
Ken Patel 2010-04-28 17:54:22 +00:00
parent 3255e51f1d
commit 2b855884a0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
direct/src/showbase/PythonUtil.py
View File

@ -4417,10 +4417,11 @@ class BpDb:
argsCopy = args[:]
def functor(*cArgs, **ckArgs):
ckArgs.update(kArgs)
ckArgs.pop('static', None)
ckArgs['frameCount'] = ckArgs.get('frameCount',1)+1
return bpdb.bp(*(cArgs), **ckArgs)
kwArgs = kArgs
kwArgs.update(ckArgs)
kwArgs.pop('static', None)
kwArgs['frameCount'] = ckArgs.get('frameCount',1)+1
return bpdb.bp(*(cArgs), **kwArgs)
if kArgs.get('static'):
return staticmethod(functor)
@ -4438,7 +4439,7 @@ class bp:
moduleName = None
callingModule = inspect.getmodule(inspect.stack()[frameCount][0])
if callingModule.__name__ != '__main__':
if callingModule and callingModule.__name__ != '__main__':
#get only leaf module name
moduleName = callingModule.__name__.split()[-1]