diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-06-19 10:47:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-19 10:52:26 +0300 |
| commit | 7b14065729af4266bffbf70ef0de3bd646ec555c (patch) | |
| tree | bbb13136b933e369227cea9f1baafdc455a93806 /source/blender/makesdna | |
| parent | 2ecb9856bc3a77354c9785a7119a0904d11e0d8c (diff) | |
Manipulator: de-duplicate flags and scale option
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 8 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 9f5d33531f6..01ad818d0f1 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -494,8 +494,7 @@ typedef struct UserDef { short gp_settings; short tb_leftmouse, tb_rightmouse; struct SolidLight light[3]; - short tw_hotspot, tw_flag, tw_handlesize, tw_size; - short manipulator_flag, manipulator_scale; + short manipulator_flag, manipulator_size; int pad3; short textimeout, texcollectrate; short wmdrawmethod; /* removed wmpad */ @@ -796,6 +795,11 @@ typedef enum eGP_UserdefSettings { GP_PAINT_DOSIMPLIFY = (1 << 1), } eGP_UserdefSettings; +enum { + USER_MANIPULATOR_DRAW = (1 << 0), + USER_MANIPULATOR_SHADED = (1 << 1), +}; + /* color picker types */ typedef enum eColorPicker_Types { USER_CP_CIRCLE_HSV = 0, diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 6c526d125d6..22bb3cd5add 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -380,11 +380,10 @@ enum { #define V3D_MANIP_GIMBAL 4 #define V3D_MANIP_CUSTOM 5 -/* View3d->twflag */ - /* USE = user setting, DRAW = based on selection */ -#define V3D_USE_MANIPULATOR 1 -#define V3D_DRAW_MANIPULATOR (1 << 1) -#define V3D_SHADED_MANIPULATORS (1 << 2) +/* View3d->twflag (also) */ +enum { + V3D_MANIPULATOR_DRAW = (1 << 0), +}; /* BGPic->flag */ /* may want to use 1 for select ? */ |