[Bf-blender-cvs] [5bd731b6730] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 5bd731b6730b6dc31dad7c3e8ccf0555b7bed3f1
Author: Campbell Barton
Date:   Fri Aug 24 11:54:12 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB5bd731b6730b6dc31dad7c3e8ccf0555b7bed3f1

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/interface/interface_layout.c
index f3f08b10257,140fdbe355b..ec35325416a
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@@ -2017,34 -1828,16 +2037,17 @@@ void uiItemPointerR_prop
  	StructRNA *icontype;
  	int w, h;
  	char namestr[UI_MAX_NAME_STR];
 +	const bool use_prop_sep = ((layout->item.flag & UI_ITEM_PROP_SEP) != 0);
  
- 	/* validate arguments */
- 	prop = RNA_struct_find_property(ptr, propname);
- 
- 	if (!prop) {
- 		RNA_warning("property not found: %s.%s",
- 		            RNA_struct_identifier(ptr->type), propname);
- 		return;
- 	}
- 
  	type = RNA_property_type(prop);
  	if (!ELEM(type, PROP_POINTER, PROP_STRING, PROP_ENUM)) {
- 		RNA_warning("Property %s must be a pointer, string or enum", propname);
- 		return;
- 	}
- 
- 	searchprop = RNA_struct_find_property(searchptr, searchpropname);
- 
- 
- 	if (!searchprop) {
- 		RNA_warning("search collection property not found: %s.%s",
- 		            RNA_struct_identifier(searchptr->type), searchpropname);
+ 		RNA_warning("Property %s.%s must be a pointer, string or enum",
+ 		            RNA_struct_identifier(ptr->type), RNA_property_identifier(prop));
  		return;
  	}
- 	else if (RNA_property_type(searchprop) != PROP_COLLECTION) {
+ 	if (RNA_property_type(searchprop) != PROP_COLLECTION) {
  		RNA_warning("search collection property is not a collection type: %s.%s",
- 		            RNA_struct_identifier(searchptr->type), searchpropname);
+ 		            RNA_struct_identifier(searchptr->type), RNA_property_identifier(searchprop));
  		return;
  	}