diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-23 11:44:21 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-23 11:44:21 +0300 |
commit | ce2295999e5fc667f3574b9c53cba04155bd1546 (patch) | |
tree | f54198fa757c4282a2f0f79c46d6fedbbf728480 /source/blender/makesrna | |
parent | 225be0cf30940cf840bbac0f19b10efadecf94d4 (diff) |
use zero initializers instead of memset(), also change PointerRNA_NULL from an extern into a define.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/RNA_access.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 21 |
2 files changed, 8 insertions, 15 deletions
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index edde9ead0e9..0dd9ff58453 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -583,7 +583,7 @@ void RNA_pointer_create(struct ID *id, StructRNA *type, void *data, PointerRNA * void RNA_blender_rna_pointer_create(PointerRNA *r_ptr); void RNA_pointer_recast(PointerRNA *ptr, PointerRNA *r_ptr); -extern PointerRNA PointerRNA_NULL; +#define PointerRNA_NULL ((PointerRNA){{0}}) /* Structs */ diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 0144a0c1bdf..fd66cf58b1d 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -90,8 +90,6 @@ void RNA_exit() /* Pointer */ -PointerRNA PointerRNA_NULL = {{0}, 0, 0}; - void RNA_main_pointer_create(struct Main *main, PointerRNA *r_ptr) { r_ptr->id.data= NULL; @@ -168,9 +166,8 @@ void RNA_blender_rna_pointer_create(PointerRNA *r_ptr) PointerRNA rna_pointer_inherit_refine(PointerRNA *ptr, StructRNA *type, void *data) { - PointerRNA result; - if(data) { + PointerRNA result; result.data= data; result.type= type; rna_pointer_inherit_id(type, ptr, &result); @@ -183,11 +180,11 @@ PointerRNA rna_pointer_inherit_refine(PointerRNA *ptr, StructRNA *type, void *da else result.type= type; } + return result; + } + else { + return PointerRNA_NULL; } - else - memset(&result, 0, sizeof(result)); - - return result; } /**/ @@ -1972,8 +1969,7 @@ PointerRNA RNA_property_pointer_get(PointerRNA *ptr, PropertyRNA *prop) return RNA_property_pointer_get(ptr, prop); } else { - PointerRNA result= {{0}}; - return result; + return PointerRNA_NULL; } } @@ -3561,12 +3557,9 @@ PointerRNA RNA_pointer_get(PointerRNA *ptr, const char *name) return RNA_property_pointer_get(ptr, prop); } else { - PointerRNA result; - printf("RNA_pointer_get: %s.%s not found.\n", ptr->type->identifier, name); - memset(&result, 0, sizeof(result)); - return result; + return PointerRNA_NULL; } } |