diff options
| author | Alexander Romanov <a.romanov@blend4web.com> | 2017-04-20 11:39:20 +0300 |
|---|---|---|
| committer | Alexander Romanov <a.romanov@blend4web.com> | 2017-04-20 11:40:31 +0300 |
| commit | 31c644b657d3dbfaa170e5893fcd69ea5b87d670 (patch) | |
| tree | b84e761eec3c42d421174d9c723b6e7bc3db0c40 /source/blender/makesrna/intern/rna_access.c | |
| parent | 6da53e46c9dc81fcbabd49d1db0f88c5e876cf43 (diff) | |
Fix T51198: Crash with new Datablock ID Properties
Diffstat (limited to 'source/blender/makesrna/intern/rna_access.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index c3d2d92fc5e..a299302f04f 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -5599,12 +5599,13 @@ static char *rna_pointer_as_string__bldata(PointerRNA *ptr) } } -char *RNA_pointer_as_string(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *prop_ptr, PointerRNA *ptr_prop) +char *RNA_pointer_as_string(bContext *C, PointerRNA *ptr, PropertyRNA *prop_ptr, PointerRNA *ptr_prop) { + IDProperty *prop; if (ptr_prop->data == NULL) { return BLI_strdup("None"); } - else if (RNA_property_flag(prop_ptr) & PROP_IDPROPERTY) { + else if ((prop = rna_idproperty_check(&prop_ptr, ptr)) && prop->type != IDP_ID) { return RNA_pointer_as_string_id(C, ptr_prop); } else { |