From 8cebb52c8430ed7e65f179bfe569c7cc78c80bc4 Mon Sep 17 00:00:00 2001 From: Darren Ranalli Date: Tue, 21 Jun 2005 02:57:48 +0000 Subject: [PATCH] POD: handle multiple inheritance --- direct/src/showbase/PythonUtil.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/direct/src/showbase/PythonUtil.py b/direct/src/showbase/PythonUtil.py index 41a84f090c..40724bc41a 100644 --- a/direct/src/showbase/PythonUtil.py +++ b/direct/src/showbase/PythonUtil.py @@ -1240,11 +1240,13 @@ class POD: # bring less-derived classes to the front mostDerivedLast(bases) for c in (bases + [cls]): - # make sure this base has its dict of data defaults - c._compileDefaultDataSet() - if c.__dict__.has_key('DataSet'): - # apply this class' default data values to our dict - cls._DataSet.update(c.DataSet) + # skip multiple-inheritance base classes that do not derive from POD + if issubclass(c, POD): + # make sure this base has its dict of data defaults + c._compileDefaultDataSet() + if c.__dict__.has_key('DataSet'): + # apply this class' default data values to our dict + cls._DataSet.update(c.DataSet) _compileDefaultDataSet = classmethod(_compileDefaultDataSet) # END CLASS METHODS