Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 15 Aug 2018 22:18:52 +0000 (08:18 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 15 Aug 2018 22:18:52 +0000 (08:18 +1000)
1  2 
source/blender/editors/transform/transform_ops.c

index 1f1cc646f20a0bca2ffd8289119150ab325b66c4,7120158ab46bdb7fc5a782c65cf00a4a572b5f42..ad51528ad47db8736d7fcb00c66ffda8c1620b97
@@@ -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)
        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);
  }