diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-05-20 15:35:22 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-20 15:35:34 +0400 |
commit | 9296f0c2fe3b53fbff8cf44fd2d1be7bbb181d04 (patch) | |
tree | 67ecc07360942ee03922007246ac84ab38e257fd /source | |
parent | c998d6d4b5a3bd88375c3255761e1e64a5321559 (diff) |
This reverts commit c998d6d4b5a3bd88375c3255761e1e64a5321559.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 270c35066a8..ded0278b44d 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -4548,8 +4548,7 @@ char *RNA_path_full_struct_py(struct PointerRNA *ptr) char *RNA_path_full_property_py(PointerRNA *ptr, PropertyRNA *prop, int index) { char *id_path; - const char *data_path_fallback = "(null)"; - const char *data_path; + char *data_path; char *ret; @@ -4561,9 +4560,6 @@ char *RNA_path_full_property_py(PointerRNA *ptr, PropertyRNA *prop, int index) id_path = RNA_path_full_ID_py(ptr->id.data); data_path = RNA_path_from_ID_to_property(ptr, prop); - if (data_path == NULL) { - data_path = data_path_fallback; - } if ((index == -1) || (RNA_property_array_check(prop) == false)) { ret = BLI_sprintfN("%s.%s", @@ -4574,8 +4570,8 @@ char *RNA_path_full_property_py(PointerRNA *ptr, PropertyRNA *prop, int index) id_path, data_path, index); } MEM_freeN(id_path); - if (data_path != data_path_fallback) { - MEM_freeN((void *)data_path); + if (data_path) { + MEM_freeN(data_path); } return ret; |