[Bf-blender-cvs] [695a824595b] custom-manipulators: Merge branch '28' into custom-manipulators

[Campbell Barton]

Commit: 695a824595b266b9d69e4f372fa507a84660c7b6
Author: Campbell Barton
Date:   Wed Jun 21 12:45:02 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB695a824595b266b9d69e4f372fa507a84660c7b6

Merge branch '28' into custom-manipulators

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



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

diff --cc source/blender/python/intern/bpy_rna.c
index 41b96e2f044,6f3d0145d87..8b122b24cd9
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@@ -1842,17 -1842,10 +1842,17 @@@ static int pyrna_py_to_prop
  				    (BPy_StructRNA_Check(value)) &&
  				    (RNA_struct_is_a(((BPy_StructRNA *)value)->ptr.type, &RNA_Operator)))
  				{
- 					value = PyObject_GetAttrString(value, "properties");
+ 					value = PyObject_GetAttr(value, bpy_intern_str_properties);
  					value_new = value;
  				}
 -
 +				/* XXX, de-duplicate (abive) */
 +				else if ((ptr_type == &RNA_AnyType) &&
 +				         (BPy_StructRNA_Check(value)) &&
 +				    (RNA_struct_is_a(((BPy_StructRNA *)value)->ptr.type, &RNA_Manipulator)))
 +				{
 +					value = PyObject_GetAttrString(value, "properties");
 +					value_new = value;
 +				}
  
  				/* if property is an OperatorProperties pointer and value is a map,
  				 * forward back to pyrna_pydict_to_props */