Revision: 35812
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35812
Author: campbellbarton
Date: 2011-03-27 06:21:50 +0000 (Sun, 27 Mar 2011)
Log Message:
-----------
improvement for last commit. check the parent classes property is the same (not just matching name), incase we intentionally shadow properties in subclasses.
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_operators/wm.py
Modified: trunk/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/wm.py 2011-03-27 06:15:55 UTC (rev 35811)
+++ trunk/blender/release/scripts/startup/bl_operators/wm.py 2011-03-27 06:21:50 UTC (rev 35812)
@@ -619,11 +619,12 @@
else:
# detect if this is a inherited member and use that name instead
- class_parent = getattr(bpy.types, class_name).bl_rna.base
- while class_parent and class_prop in class_parent.properties:
- class_name = class_parent.identifier
- class_parent = class_parent.base
- # done!
+ rna_parent = getattr(bpy.types, class_name).bl_rna
+ rna_prop = rna_parent.properties[class_prop]
+ rna_parent = rna_parent.base
+ while rna_parent and rna_prop == rna_parent.properties.get(class_prop):
+ class_name = rna_parent.identifier
+ rna_parent = rna_parent.base
# It so happens that epydoc nests these, not sphinx
# class_name_full = self._nested_class_string(class_name)