[Bf-blender-cvs] [31c644b657d] master: Fix T51198: Crash with new Datablock ID Properties

[Alexander Romanov]

Commit: 31c644b657d3dbfaa170e5893fcd69ea5b87d670
Author: Alexander Romanov
Date:   Thu Apr 20 11:39:20 2017 +0300
Branches: master
https://developer.blender.org/rB31c644b657d3dbfaa170e5893fcd69ea5b87d670

Fix T51198: Crash with new Datablock ID Properties

===================================================================

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 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 {