[Bf-blender-cvs] [3d56bfbc825] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 3d56bfbc8252dd371853f4a34eb29a67cd29337f
Author: Campbell Barton
Date:   Tue Aug 29 16:06:26 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB3d56bfbc8252dd371853f4a34eb29a67cd29337f

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/transform/transform_generics.c
index 5fd34cde3d6,179b68dd270..215be83abf4
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@@ -1339,29 -1325,13 +1339,24 @@@ void initTransInfo(bContext *C, TransIn
  	if (op && ((prop = RNA_struct_find_property(op->ptr, "constraint_orientation")) &&
  	           RNA_property_is_set(op->ptr, prop)))
  	{
 -		t->current_orientation = RNA_property_enum_get(op->ptr, prop);
 +		short orientation = RNA_property_enum_get(op->ptr, prop);
 +		TransformOrientation *custom_orientation = NULL;
  
 -		if (t->current_orientation >= V3D_MANIP_CUSTOM + BIF_countTransformOrientation(C)) {
 -			t->current_orientation = V3D_MANIP_GLOBAL;
 +		if (orientation >= V3D_MANIP_CUSTOM) {
 +			if (orientation >= V3D_MANIP_CUSTOM + BIF_countTransformOrientation(C)) {
 +				orientation = V3D_MANIP_GLOBAL;
 +			}
 +			else {
 +				custom_orientation = BKE_workspace_transform_orientation_find(
 +				                         CTX_wm_workspace(C), orientation - V3D_MANIP_CUSTOM);
 +				orientation = V3D_MANIP_CUSTOM;
 +			}
  		}
 +
 +		t->current_orientation = orientation;
 +		t->custom_orientation = custom_orientation;
  	}
  
- 	if (op && (prop = RNA_struct_find_property(op->ptr, "center_override")) && RNA_property_is_set(op->ptr, prop)) {
- 		RNA_property_float_get_array(op->ptr, prop, t->center);
- 		t->flag |= T_OVERRIDE_CENTER;
- 	}
- 
  	if (op && ((prop = RNA_struct_find_property(op->ptr, "release_confirm")) &&
  	           RNA_property_is_set(op->ptr, prop)))
  	{