diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-10 05:57:26 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-10 06:01:09 +0300 |
| commit | 5ff33ecdf0ed319db2e589926a614f67738531a6 (patch) | |
| tree | 75646e8ba2b3520716adb44e9fda7db84be84aa8 /source/blender/makesrna/intern/rna_access.c | |
| parent | 5c3dc01f54703e844893e55230ebafb9e4bdcd18 (diff) | |
| parent | cacba951eaa266c7fc53cd25be6afc0fb7951425 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_access.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index 00b22ed4918..e62869f966b 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -5780,13 +5780,10 @@ char *RNA_pointer_as_string_id(bContext *C, PointerRNA *ptr) static char *rna_pointer_as_string__bldata(PointerRNA *ptr) { - if (ptr->type == NULL) { + if (ptr->type == NULL || ptr->id.data == NULL) { return BLI_strdup("None"); } else if (RNA_struct_is_ID(ptr->type)) { - if (ptr->id.data == NULL) { - return BLI_strdup("None"); - } return RNA_path_full_ID_py(ptr->id.data); } else { |