[Bf-blender-cvs] [9296f0c] master: This reverts commit c998d6d4b5a3bd88375c3255761e1e64a5321559.
Campbell Barton
noreply at git.blender.org
Tue May 20 13:35:55 CEST 2014
Commit: 9296f0c2fe3b53fbff8cf44fd2d1be7bbb181d04
Author: Campbell Barton
Date: Tue May 20 21:35:22 2014 +1000
https://developer.blender.org/rB9296f0c2fe3b53fbff8cf44fd2d1be7bbb181d04
This reverts commit c998d6d4b5a3bd88375c3255761e1e64a5321559.
===================================================================
M source/blender/makesrna/intern/rna_access.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 270c350..ded0278 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;
More information about the Bf-blender-cvs
mailing list