[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33240] trunk/blender/source/blender/ makesrna/intern/rna_rna.c: bugfix [#23609] Lamp PointerProperty

[Campbell Barton]

Revision: 33240
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33240
Author:   campbellbarton
Date:     2010-11-22 21:44:59 +0100 (Mon, 22 Nov 2010)

Log Message:
-----------
bugfix [#23609] Lamp PointerProperty

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_rna.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_rna.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_rna.c	2010-11-22 18:51:40 UTC (rev 33239)
+++ trunk/blender/source/blender/makesrna/intern/rna_rna.c	2010-11-22 20:44:59 UTC (rev 33240)
@@ -115,11 +115,12 @@
 
 	/* function to skip any id properties that are already known by RNA,
 	 * for the second loop where we go over unknown id properties */
+	do {
+		for(prop= ptype->cont.properties.first; prop; prop=prop->next)
+			if((prop->flag & PROP_BUILTIN) == 0 && strcmp(prop->identifier, idprop->name) == 0)
+				return 1;
+	} while((ptype=ptype->base));
 
-	for(prop= ptype->cont.properties.first; prop; prop=prop->next)
-		if(strcmp(prop->identifier, idprop->name) == 0)
-			return 1;
-	
 	return 0;
 }
 
@@ -303,9 +304,8 @@
 {
 	StructRNA *srna;
 	PropertyRNA *prop;
-	PointerRNA propptr;
+	PointerRNA propptr= {{0}};
 
-	memset(&propptr, 0, sizeof(propptr));
 	srna= ptr->type;
 
 	do {