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

[Campbell Barton]

Commit: c4022da6172ec49972e18151a1da4fa270622c46
Author: Campbell Barton
Date:   Thu Aug 16 08:18:52 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBc4022da6172ec49972e18151a1da4fa270622c46

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/editors/transform/transform_ops.c
index 1f1cc646f20,7120158ab46..ad51528ad47
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@@ -650,14 -628,9 +650,14 @@@ static void TRANSFORM_OT_translate(stru
  	ot->poll   = ED_operator_screenactive;
  	ot->poll_property = transform_poll_property;
  
- 	RNA_def_float_vector_xyz(ot->srna, "value", 3, NULL, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX);
+ 	RNA_def_float_vector_xyz(ot->srna, "value", 3, NULL, -FLT_MAX, FLT_MAX, "Move", "", -FLT_MAX, FLT_MAX);
  
 -	Transform_Properties(ot, P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_ALIGN_SNAP | P_OPTIONS | P_GPENCIL_EDIT);
 +	WM_operatortype_props_advanced_begin(ot);
 +
 +	Transform_Properties(
 +	        ot,
 +	        P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_ALIGN_SNAP | P_OPTIONS |
 +	        P_GPENCIL_EDIT | P_CURSOR_EDIT);
  }
  
  static void TRANSFORM_OT_resize(struct wmOperatorType *ot)
@@@ -676,10 -649,8 +676,10 @@@
  	ot->poll   = ED_operator_screenactive;
  	ot->poll_property = transform_poll_property;
  
- 	RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX);
+ 	RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, "Scale", "", -FLT_MAX, FLT_MAX);
  
 +	WM_operatortype_props_advanced_begin(ot);
 +
  	Transform_Properties(
  	        ot, P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_GEO_SNAP | P_OPTIONS | P_GPENCIL_EDIT | P_CENTER);
  }
@@@ -710,10 -681,8 +710,10 @@@ static void TRANSFORM_OT_skin_resize(st
  	ot->poll   = skin_resize_poll;
  	ot->poll_property = transform_poll_property;
  
- 	RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX);
+ 	RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, "Scale", "", -FLT_MAX, FLT_MAX);
  
 +	WM_operatortype_props_advanced_begin(ot);
 +
  	Transform_Properties(ot, P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_GEO_SNAP | P_OPTIONS | P_NO_TEXSPACE);
  }
  
@@@ -1075,10 -1018,8 +1075,10 @@@ static void TRANSFORM_OT_seq_slide(stru
  	ot->cancel = transform_cancel;
  	ot->poll   = ED_operator_sequencer_active;
  
- 	RNA_def_float_vector_xyz(ot->srna, "value", 2, NULL, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX);
+ 	RNA_def_float_vector_xyz(ot->srna, "value", 2, NULL, -FLT_MAX, FLT_MAX, "Offset", "", -FLT_MAX, FLT_MAX);
  
 +	WM_operatortype_props_advanced_begin(ot);
 +
  	Transform_Properties(ot, P_SNAP);
  }