TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 01:44:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

POD: handle multiple inheritance

Browse Source
This commit is contained in:
Darren Ranalli 2005-06-21 02:57:48 +00:00
parent bf54580d8e
commit 8cebb52c84
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1240,11 +1240,13 @@ class POD:
# bring less-derived classes to the front # bring less-derived classes to the front
mostDerivedLast(bases) mostDerivedLast(bases)
for c in (bases + [cls]): for c in (bases + [cls]):
# make sure this base has its dict of data defaults # skip multiple-inheritance base classes that do not derive from POD
c._compileDefaultDataSet() if issubclass(c, POD):
if c.__dict__.has_key('DataSet'): # make sure this base has its dict of data defaults
# apply this class' default data values to our dict c._compileDefaultDataSet()
cls._DataSet.update(c.DataSet) if c.__dict__.has_key('DataSet'):
# apply this class' default data values to our dict
cls._DataSet.update(c.DataSet)
_compileDefaultDataSet = classmethod(_compileDefaultDataSet) _compileDefaultDataSet = classmethod(_compileDefaultDataSet)
# END CLASS METHODS # END CLASS METHODS