[Bf-blender-cvs] [38589ce6ef0] datablock_idprops: Fix bad auto-generated UI for ID IDProps.

Bastien Montagne noreply at git.blender.org
Mon Mar 27 15:20:03 CEST 2017


Commit: 38589ce6ef0d48b9e7cc6a6496de824661ed8271
Author: Bastien Montagne
Date:   Mon Mar 27 14:52:15 2017 +0200
Branches: datablock_idprops
https://developer.blender.org/rB38589ce6ef0d48b9e7cc6a6496de824661ed8271

Fix bad auto-generated UI for ID IDProps.

`RNA_path_resolve()` tries to 'dereference' pointer properties, was not
a problem before but now that we do have pointer IDProps we want to get
property here, not it's pointed data.

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

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 6daa3f95a9f..4f4df44b73e 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -641,8 +641,11 @@ PropertyRNA *RNA_struct_find_property(PointerRNA *ptr, const char *identifier)
 		/* id prop lookup, not so common */
 		PropertyRNA *r_prop = NULL;
 		PointerRNA r_ptr; /* only support single level props */
-		if (RNA_path_resolve(ptr, identifier, &r_ptr, &r_prop) && (r_ptr.type == ptr->type) && (r_ptr.data == ptr->data))
+		if (RNA_path_resolve_property(ptr, identifier, &r_ptr, &r_prop) &&
+		    (r_ptr.type == ptr->type) && (r_ptr.data == ptr->data))
+		{
 			return r_prop;
+		}
 	}
 	else {
 		/* most common case */




More information about the Bf-blender-cvs mailing list