Merge branch 'blender2.8' into soc-2018-bevel
authorRohan Rathi <rohanrathi08@gmail.com>
Tue, 29 May 2018 05:40:54 +0000 (11:10 +0530)
committerRohan Rathi <rohanrathi08@gmail.com>
Tue, 29 May 2018 05:40:54 +0000 (11:10 +0530)
16 files changed:
1  2 
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/draw/intern/draw_cache_impl_mesh.c
source/blender/editors/include/ED_screen.h
source/blender/editors/include/ED_transform.h
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c

@@@ -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);
  
@@@ -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
Simple merge