diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-01-16 18:02:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-16 18:02:07 +0300 |
| commit | e025bf3967fc281db09b7a75d9fef2b78ba3181e (patch) | |
| tree | d9dcb70d7bb24dc7a62792f94c6381e7ec0e1af3 /source/blender/makesrna/intern/rna_define.c | |
| parent | 5b3bf80dd89ab08abf0f22a7eba636e7127955e2 (diff) | |
defining types via python gave confusing errors because DefRNA.laststruct was being used for errors when the new property wasn't on the last struct.
added CONTAINER_RNA_ID() define to get the ID from the ContainerRNA type.
Diffstat (limited to 'source/blender/makesrna/intern/rna_define.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_define.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index b6b0bd3ae84..454ed7cee71 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -839,7 +839,7 @@ void RNA_def_struct_ui_icon(StructRNA *srna, int icon) PropertyRNA *RNA_def_property(StructOrFunctionRNA *cont_, const char *identifier, int type, int subtype) { - StructRNA *srna= DefRNA.laststruct; + /*StructRNA *srna= DefRNA.laststruct;*/ /* invalid for python defined props */ ContainerRNA *cont= cont_; ContainerDefRNA *dcont; PropertyDefRNA *dprop= NULL; @@ -849,7 +849,7 @@ PropertyRNA *RNA_def_property(StructOrFunctionRNA *cont_, const char *identifier char error[512]; if (rna_validate_identifier(identifier, error, 1) == 0) { - fprintf(stderr, "RNA_def_property: property identifier \"%s.%s\" - %s\n", srna->identifier, identifier, error); + fprintf(stderr, "RNA_def_property: property identifier \"%s.%s\" - %s\n", CONTAINER_RNA_ID(cont), identifier, error); DefRNA.error= 1; } @@ -857,7 +857,7 @@ PropertyRNA *RNA_def_property(StructOrFunctionRNA *cont_, const char *identifier /* XXX - toto, detect supertype collisions */ if(rna_findlink(&dcont->properties, identifier)) { - fprintf(stderr, "RNA_def_property: duplicate identifier \"%s.%s\"\n", srna->identifier, identifier); + fprintf(stderr, "RNA_def_property: duplicate identifier \"%s.%s\"\n", CONTAINER_RNA_ID(cont), identifier); DefRNA.error= 1; } @@ -915,7 +915,7 @@ PropertyRNA *RNA_def_property(StructOrFunctionRNA *cont_, const char *identifier case PROP_COLLECTION: break; default: - fprintf(stderr, "RNA_def_property: \"%s.%s\", invalid property type.\n", srna->identifier, identifier); + fprintf(stderr, "RNA_def_property: \"%s.%s\", invalid property type.\n", CONTAINER_RNA_ID(cont), identifier); DefRNA.error= 1; return NULL; } |