[Bf-blender-cvs] [dca08a4440f] soc-2017-normal-tools: Merge branch 'master' into soc-2017-normal-tools

Rohan Rathi noreply at git.blender.org
Tue Sep 5 15:01:27 CEST 2017


Commit: dca08a4440fdc5670bffab9b28120fdacd53364c
Author: Rohan Rathi
Date:   Tue Sep 5 16:25:51 2017 +0530
Branches: soc-2017-normal-tools
https://developer.blender.org/rBdca08a4440fdc5670bffab9b28120fdacd53364c

Merge branch 'master' into soc-2017-normal-tools

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



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

diff --cc source/blender/editors/include/ED_transform.h
index 9db0d632d8f,9a0a7f8f1bb..9a506e7038d
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@@ -149,8 -148,8 +149,9 @@@ int BIF_countTransformOrientation(cons
  #define P_CORRECT_UV    (1 << 8)
  #define P_NO_DEFAULTS   (1 << 10)
  #define P_NO_TEXSPACE   (1 << 11)
- #define P_GPENCIL_EDIT  (1 << 12)
- #define P_CLNOR_INVALIDATE (1 << 13)
+ #define P_CENTER        (1 << 12)
+ #define P_GPENCIL_EDIT  (1 << 13)
++#define P_CLNOR_INVALIDATE (1 << 14)
  
  void Transform_Properties(struct wmOperatorType *ot, int flags);
  
diff --cc source/blender/editors/transform/transform.h
index 629d16e3abc,06a60456cdb..cbbcbad5434
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@@ -533,8 -533,9 +533,10 @@@ typedef struct TransInfo 
  	/* alternative transformation. used to add offset to tracking markers */
  #define T_ALT_TRANSFORM		(1 << 24)
  
- #define T_CLNOR_REBUILD		(1 << 26)
+ 	/** #TransInfo.center has been set, don't change it. */
+ #define T_OVERRIDE_CENTER	(1 << 25)
  
++#define T_CLNOR_REBUILD		(1 << 26)
  /* TransInfo->modifiers */
  #define	MOD_CONSTRAINT_SELECT	0x01
  #define	MOD_PRECISION			0x02
diff --cc source/blender/editors/transform/transform_ops.c
index 91778dc84ee,1aa800f9fb1..d7d75b2fbb2
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@@ -620,8 -620,9 +628,8 @@@ static void TRANSFORM_OT_resize(struct 
  
  	RNA_def_float_vector(ot->srna, "value", 3, VecOne, -FLT_MAX, FLT_MAX, "Vector", "", -FLT_MAX, FLT_MAX);
  
- 	Transform_Properties(ot, P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_GEO_SNAP | P_OPTIONS | P_GPENCIL_EDIT | P_CLNOR_INVALIDATE);
- }
+ 	Transform_Properties(
 -	        ot, P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_GEO_SNAP | P_OPTIONS | P_GPENCIL_EDIT | P_CENTER);
 -}
++	        ot, P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_GEO_SNAP | P_OPTIONS | P_GPENCIL_EDIT | P_CENTER | P_CLNOR_INVALIDATE);}
  
  static int skin_resize_poll(bContext *C)
  {
@@@ -671,8 -672,8 +679,7 @@@ static void TRANSFORM_OT_trackball(stru
  	/* Maybe we could use float_vector_xyz here too? */
  	RNA_def_float_rotation(ot->srna, "value", 2, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -FLT_MAX, FLT_MAX);
  
- 	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_GPENCIL_EDIT | P_CLNOR_INVALIDATE);
 -	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_GPENCIL_EDIT | P_CENTER);
--}
++	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_GPENCIL_EDIT | P_CENTER | P_CLNOR_INVALIDATE);}
  
  static void TRANSFORM_OT_rotate(struct wmOperatorType *ot)
  {
@@@ -691,8 -692,9 +698,8 @@@
  
  	RNA_def_float_rotation(ot->srna, "value", 0, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI * 2, M_PI * 2);
  
- 	Transform_Properties(ot, P_AXIS | P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_GEO_SNAP | P_GPENCIL_EDIT | P_CLNOR_INVALIDATE);
- }
+ 	Transform_Properties(
 -	        ot, P_AXIS | P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_GEO_SNAP | P_GPENCIL_EDIT | P_CENTER);
 -}
++	        ot, P_AXIS | P_CONSTRAINT | P_PROPORTIONAL | P_MIRROR | P_GEO_SNAP | P_GPENCIL_EDIT | P_CENTER | P_CLNOR_INVALIDATE);}
  
  static void TRANSFORM_OT_tilt(struct wmOperatorType *ot)
  {
@@@ -734,8 -736,8 +741,7 @@@ static void TRANSFORM_OT_bend(struct wm
  
  	RNA_def_float_rotation(ot->srna, "value", 1, NULL, -FLT_MAX, FLT_MAX, "Angle", "", -M_PI * 2, M_PI * 2);
  
- 	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_GPENCIL_EDIT | P_CLNOR_INVALIDATE);
 -	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_GPENCIL_EDIT | P_CENTER);
--}
++	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_GPENCIL_EDIT | P_CENTER | P_CLNOR_INVALIDATE);}
  
  static void TRANSFORM_OT_shear(struct wmOperatorType *ot)
  {
@@@ -775,8 -777,8 +781,7 @@@ static void TRANSFORM_OT_push_pull(stru
  
  	RNA_def_float(ot->srna, "value", 0, -FLT_MAX, FLT_MAX, "Distance", "", -FLT_MAX, FLT_MAX);
  
- 	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_CLNOR_INVALIDATE);
 -	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_CENTER);
--}
++	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_CENTER | P_CLNOR_INVALIDATE);}
  
  static void TRANSFORM_OT_shrink_fatten(struct wmOperatorType *ot)
  {
@@@ -818,8 -820,8 +823,7 @@@ static void TRANSFORM_OT_tosphere(struc
  
  	RNA_def_float_factor(ot->srna, "value", 0, 0, 1, "Factor", "", 0, 1);
  
- 	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_GPENCIL_EDIT | P_CLNOR_INVALIDATE);
 -	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_GPENCIL_EDIT | P_CENTER);
--}
++	Transform_Properties(ot, P_PROPORTIONAL | P_MIRROR | P_SNAP | P_GPENCIL_EDIT | P_CENTER | P_CLNOR_INVALIDATE);}
  
  static void TRANSFORM_OT_mirror(struct wmOperatorType *ot)
  {
@@@ -836,8 -838,8 +840,7 @@@
  	ot->cancel = transform_cancel;
  	ot->poll   = ED_operator_screenactive;
  
- 	Transform_Properties(ot, P_CONSTRAINT | P_PROPORTIONAL | P_GPENCIL_EDIT | P_CLNOR_INVALIDATE);
 -	Transform_Properties(ot, P_CONSTRAINT | P_PROPORTIONAL | P_GPENCIL_EDIT | P_CENTER);
--}
++	Transform_Properties(ot, P_CONSTRAINT | P_PROPORTIONAL | P_GPENCIL_EDIT | P_CENTER | P_CLNOR_INVALIDATE);}
  
  static void TRANSFORM_OT_edge_slide(struct wmOperatorType *ot)
  {



More information about the Bf-blender-cvs mailing list