diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-15 00:49:00 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-15 00:49:00 +0300 |
commit | 5ebebcfbfff4c218ab4101ee7f6a66617ee9b01f (patch) | |
tree | 86f319a9291847c2608bfd0b89bae3d504e378cf /source/blender/makesdna | |
parent | cd1600413246a62156441f6e7910489b19ae5a28 (diff) |
WM: rename manipulator to gizmo internally
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_screen_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 18 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_view3d_types.h | 14 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_workspace_types.h | 2 |
5 files changed, 20 insertions, 20 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index e6ad7835b24..0c4c0a00f1a 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1237,7 +1237,7 @@ typedef struct ToolSettings { short autoik_chainlen; /* runtime only */ /* SCE_MPR_LOC/SCAL */ - char manipulator_flag; + char gizmo_flag; /* Grease Pencil */ char gpencil_flags; /* flags/options for how the tool works */ @@ -2010,7 +2010,7 @@ typedef enum eImagePaintMode { #define EDGE_MODE_TAG_BEVEL 4 #define EDGE_MODE_TAG_FREESTYLE 5 -/* ToolSettings.manipulator_flag */ +/* ToolSettings.gizmo_flag */ #define SCE_MANIP_TRANSLATE 1 #define SCE_MANIP_ROTATE 2 #define SCE_MANIP_SCALE 4 diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 3ee6bc38644..3815f01abeb 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -347,7 +347,7 @@ typedef struct ARegion { ListBase handlers; /* wmEventHandler */ ListBase panels_category; /* Panel categories runtime */ - struct wmManipulatorMap *manipulator_map; /* manipulator-map of this region */ + struct wmGizmoMap *gizmo_map; /* gizmo-map of this region */ struct wmTimer *regiontimer; /* blend in/out */ struct wmDrawBuffer *draw_buffer; diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 5b8f6fcb73f..cdfcf5598e8 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -195,12 +195,12 @@ typedef struct ThemeUI { /* Axis Colors */ char xaxis[4], yaxis[4], zaxis[4]; - /* Manipulator Colors. */ - char manipulator_hi[4]; - char manipulator_primary[4]; - char manipulator_secondary[4]; - char manipulator_a[4]; - char manipulator_b[4]; + /* Gizmo Colors. */ + char gizmo_hi[4]; + char gizmo_primary[4]; + char gizmo_secondary[4]; + char gizmo_a[4]; + char gizmo_b[4]; char pad2[4]; } ThemeUI; @@ -572,7 +572,7 @@ typedef struct UserDef { short gp_settings; /* eGP_UserdefSettings */ short tb_leftmouse, tb_rightmouse; struct SolidLight light[3]; - short manipulator_flag, manipulator_size; + short gizmo_flag, gizmo_size; short pad6[3]; short textimeout, texcollectrate; short dragthreshold; @@ -751,7 +751,7 @@ typedef enum eUserpref_UI_Flag { USER_ORBIT_SELECTION = (1 << 14), USER_DEPTH_NAVIGATE = (1 << 15), USER_HIDE_DOT = (1 << 16), - USER_SHOW_MANIPULATOR_AXIS = (1 << 17), + USER_SHOW_GIZMO_AXIS = (1 << 17), USER_SHOW_VIEWPORTNAME = (1 << 18), USER_CAM_LOCK_NO_PARENT = (1 << 19), USER_ZOOM_TO_MOUSEPOS = (1 << 20), @@ -875,7 +875,7 @@ typedef enum eGP_UserdefSettings { } eGP_UserdefSettings; enum { - USER_MANIPULATOR_DRAW = (1 << 0), + USER_GIZMO_DRAW = (1 << 0), }; /* Color Picker Types. diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index e0ab3a744f1..40551701627 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -90,7 +90,7 @@ typedef struct RegionView3D { struct wmTimer *smooth_timer; - /* transform manipulator matrix */ + /* transform gizmo matrix */ float twmat[4][4]; /* min/max dot product on twmat xyz axis. */ float tw_axis_min[3], tw_axis_max[3]; @@ -236,7 +236,7 @@ typedef struct View3D { short gridsubdiv; /* Number of subdivisions in the grid between each highlighted grid line */ char gridflag; - /* transform manipulator info */ + /* transform gizmo info */ char _pad5[2], mpr_flag; short flag3; @@ -453,11 +453,11 @@ enum { /* View3d.mpr_flag (also) */ enum { - /** All manipulators. */ - V3D_MANIPULATOR_HIDE = (1 << 0), - V3D_MANIPULATOR_HIDE_NAVIGATE = (1 << 1), - V3D_MANIPULATOR_HIDE_CONTEXT = (1 << 2), - V3D_MANIPULATOR_HIDE_TOOL = (1 << 3), + /** All gizmos. */ + V3D_GIZMO_HIDE = (1 << 0), + V3D_GIZMO_HIDE_NAVIGATE = (1 << 1), + V3D_GIZMO_HIDE_CONTEXT = (1 << 2), + V3D_GIZMO_HIDE_TOOL = (1 << 3), }; #define RV3D_CAMZOOM_MIN -30 diff --git a/source/blender/makesdna/DNA_workspace_types.h b/source/blender/makesdna/DNA_workspace_types.h index 2b0f74a54ee..3eb40bfa523 100644 --- a/source/blender/makesdna/DNA_workspace_types.h +++ b/source/blender/makesdna/DNA_workspace_types.h @@ -60,7 +60,7 @@ typedef struct bToolRef_Runtime { /** One of these 3 must be defined. */ char keymap[64]; - char manipulator_group[64]; + char gizmo_group[64]; char data_block[64]; /** Use to infer primary operator to use when setting accelerator keys. */ |