[Bf-blender-cvs] [842245ac55c] soc-2018-bevel: Merge branch 'blender2.8' into soc-2018-bevel

[Rohan Rathi]

Commit: 842245ac55ceca67863cdad252d8959cefb789c5
Author: Rohan Rathi
Date:   Tue May 29 11:10:54 2018 +0530
Branches: soc-2018-bevel
https://developer.blender.org/rB842245ac55ceca67863cdad252d8959cefb789c5

Merge branch 'blender2.8' into soc-2018-bevel

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



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

diff --cc source/blender/editors/include/ED_transform.h
index 36f87e1b494,1e3c8995314..c005f83b3fb
--- a/source/blender/editors/include/ED_transform.h
+++ b/source/blender/editors/include/ED_transform.h
@@@ -153,7 -153,7 +154,8 @@@ int BIF_countTransformOrientation(cons
  #define P_NO_TEXSPACE   (1 << 11)
  #define P_CENTER        (1 << 12)
  #define P_GPENCIL_EDIT  (1 << 13)
- #define P_CLNOR_INVALIDATE (1 << 14)
+ #define P_CURSOR_EDIT   (1 << 14)
++#define P_CLNOR_INVALIDATE (1 << 15)
  
  void Transform_Properties(struct wmOperatorType *ot, int flags);
  
diff --cc source/blender/editors/transform/transform.h
index 136512516e8,b9f42a0d9fc..3718f1be9a8
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@@ -601,8 -603,8 +603,10 @@@ typedef struct TransInfo 
  	/** #TransInfo.center has been set, don't change it. */
  #define T_OVERRIDE_CENTER	(1 << 25)
  
- #define T_CLNOR_REBUILD		(1 << 26)
+ #define T_MODAL_CURSOR_SET	(1 << 26)
+ 
++#define T_CLNOR_REBUILD		(1 << 27)
 +
  /* TransInfo->modifiers */
  #define	MOD_CONSTRAINT_SELECT	0x01
  #define	MOD_PRECISION			0x02