diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-22 23:44:59 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-22 23:44:59 +0300 |
commit | 5e4f03ea0895e84d9b5175e4c4cd6e882fee6c60 (patch) | |
tree | 451dfce7b3a5794c0a0c81e079c92d4ca0cdbd76 /source/blender/makesrna/intern/rna_rna.c | |
parent | 01117ca27b7f0211a2d045e75494cc422df4b8d9 (diff) |
bugfix [#23609] Lamp PointerProperty
Diffstat (limited to 'source/blender/makesrna/intern/rna_rna.c')
-rw-r--r-- | source/blender/makesrna/intern/rna_rna.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index 81b0df1d840..3152fc04b0d 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -115,11 +115,12 @@ static int rna_idproperty_known(CollectionPropertyIterator *iter, void *data) /* 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 @@ PointerRNA rna_builtin_properties_lookup_string(PointerRNA *ptr, const char *key { StructRNA *srna; PropertyRNA *prop; - PointerRNA propptr; + PointerRNA propptr= {{0}}; - memset(&propptr, 0, sizeof(propptr)); srna= ptr->type; do { |