[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25549] trunk/blender: fix for segfault getting RNA Enum default values, minor updates to introspection class

[Campbell Barton]

Revision: 25549
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25549
Author:   campbellbarton
Date:     2009-12-25 10:01:23 +0100 (Fri, 25 Dec 2009)

Log Message:
-----------
fix for segfault getting RNA Enum default values, minor updates to introspection class

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/rna_info.py
    trunk/blender/source/blender/makesrna/intern/rna_rna.c

Modified: trunk/blender/release/scripts/modules/rna_info.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_info.py	2009-12-24 21:17:14 UTC (rev 25548)
+++ trunk/blender/release/scripts/modules/rna_info.py	2009-12-25 09:01:23 UTC (rev 25549)
@@ -53,12 +53,23 @@
         self.properties[:] = [GetInfoPropertyRNA(rna_prop, parent_id) for rna_id, rna_prop in rna_type.properties.items() if rna_id != "rna_type"]
         self.functions[:] = [GetInfoFunctionRNA(rna_prop, parent_id) for rna_prop in rna_type.functions.values()]
 
-    def getNestedProperties(self, ls = None):
+    def get_bases(self):
+        bases = []
+        item = self
+        
+        while item:
+            item = item.base
+            if item:
+                bases.append(item)
+        
+        return bases
+
+    def get_nested_properties(self, ls = None):
         if not ls:
             ls = self.properties[:]
 
         if self.nested:
-            self.nested.getNestedProperties(ls)
+            self.nested.get_nested_properties(ls)
 
         return ls
 
@@ -86,6 +97,7 @@
         self.identifier = rna_prop.identifier
         self.name = rna_prop.name
         self.description = rna_prop.description.strip()
+        self.default_str = "<UNKNOWN>"
 
     def build(self):
         rna_prop = self.bl_prop
@@ -105,6 +117,11 @@
         if self.type == "enum":
             self.enum_items[:] = rna_prop.items.keys()
 
+        if self.array_length:
+            self.default_str = str(getattr(rna_prop, "default_array", ""))
+        else:
+            self.default_str = str(getattr(rna_prop, "default", ""))
+
         self.srna = GetInfoStructRNA(rna_prop.srna) # valid for pointer/collections
 
     def __repr__(self):
@@ -125,9 +142,10 @@
         self.return_value = None
 
     def build(self):
-        rna_prop = self.bl_prop
+        rna_func = self.bl_func
+        parent_id = rna_func
         
-        for rna_id, rna_prop in rna_type.parameters.items():
+        for rna_id, rna_prop in rna_func.parameters.items():
             prop = GetInfoPropertyRNA(rna_prop, parent_id)
             if rna_prop.use_return:
                 self.return_value = prop
@@ -370,6 +388,13 @@
         rna_info.build()
         for prop in rna_info.properties:
             prop.build()
+        for func in rna_info.functions:
+            func.build()
+            for prop in func.args:
+                prop.build()
+            if func.return_value:
+                func.return_value.build()
+                
         
     #for rna_info in InfoStructRNA.global_lookup.values():
     #    print(rna_info)

Modified: trunk/blender/source/blender/makesrna/intern/rna_rna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_rna.c	2009-12-24 21:17:14 UTC (rev 25548)
+++ trunk/blender/source/blender/makesrna/intern/rna_rna.c	2009-12-25 09:01:23 UTC (rev 25549)
@@ -641,13 +641,18 @@
 	rna_idproperty_check(&prop, ptr);
 	eprop= (EnumPropertyRNA*)prop;
 
-	if(eprop->itemf==NULL || eprop->itemf==rna_EnumProperty_default_itemf || !C)
+	if(		(eprop->itemf == NULL) ||
+			(eprop->itemf == rna_EnumProperty_default_itemf) ||
+			(ptr->type == &RNA_EnumProperty) ||
+			(C == NULL))
+	{
 		return eprop->item;
+	}
 
 	return eprop->itemf(C, ptr, free);
 }
 
-/* XXX - not sore this is needed? */
+/* XXX - not sure this is needed? */
 static int rna_EnumProperty_default_get(PointerRNA *ptr)
 {
 	PropertyRNA *prop= (PropertyRNA*)ptr->data;