diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-06 13:13:01 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-06 13:22:09 +0300 |
| commit | f1c8c25a3edfbb03795250965ece9d39fef58356 (patch) | |
| tree | ae04bad082c3939783725482c5c0922ebf42068c /source/blender/editors/space_view3d | |
| parent | 32ef77bf0a995db447ad92d4a01e7ed5afcb5349 (diff) | |
UI: rename Translate/Grab to Move in UI, shortcuts stay the same.
Diffstat (limited to 'source/blender/editors/space_view3d')
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_armature.c b/source/blender/editors/space_view3d/view3d_gizmo_armature.c index 88a95e89bd8..eea906620a6 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_armature.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_armature.c @@ -155,7 +155,7 @@ static void WIDGETGROUP_armature_spline_setup(const bContext *C, wmGizmoGroup *g Object *ob = BKE_object_pose_armature_get(CTX_data_active_object(C)); bPoseChannel *pchan = BKE_pose_channel_active(ob); - const wmGizmoType *gzt_grab = WM_gizmotype_find("GIZMO_GT_grab_3d", true); + const wmGizmoType *gzt_move = WM_gizmotype_find("GIZMO_GT_move_3d", true); struct BoneSplineWidgetGroup *bspline_group = MEM_callocN(sizeof(struct BoneSplineWidgetGroup), __func__); gzgroup->customdata = bspline_group; @@ -163,10 +163,10 @@ static void WIDGETGROUP_armature_spline_setup(const bContext *C, wmGizmoGroup *g /* Handles */ for (int i = 0; i < ARRAY_SIZE(bspline_group->handles); i++) { wmGizmo *gz; - gz = bspline_group->handles[i].gizmo = WM_gizmo_new_ptr(gzt_grab, gzgroup, NULL); - RNA_enum_set(gz->ptr, "draw_style", ED_GIZMO_GRAB_STYLE_RING_2D); + gz = bspline_group->handles[i].gizmo = WM_gizmo_new_ptr(gzt_move, gzgroup, NULL); + RNA_enum_set(gz->ptr, "draw_style", ED_GIZMO_MOVE_STYLE_RING_2D); RNA_enum_set(gz->ptr, "draw_options", - ED_GIZMO_GRAB_DRAW_FLAG_FILL | ED_GIZMO_GRAB_DRAW_FLAG_ALIGN_VIEW); + ED_GIZMO_MOVE_DRAW_FLAG_FILL | ED_GIZMO_MOVE_DRAW_FLAG_ALIGN_VIEW); WM_gizmo_set_flag(gz, WM_GIZMO_DRAW_VALUE, true); UI_GetThemeColor3fv(TH_GIZMO_PRIMARY, gz->color); diff --git a/source/blender/editors/space_view3d/view3d_gizmo_lamp.c b/source/blender/editors/space_view3d/view3d_gizmo_lamp.c index 057c085b69d..044efae0402 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_lamp.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_lamp.c @@ -261,7 +261,7 @@ static bool WIDGETGROUP_lamp_target_poll(const bContext *C, wmGizmoGroupType *UN static void WIDGETGROUP_lamp_target_setup(const bContext *UNUSED(C), wmGizmoGroup *gzgroup) { wmGizmoWrapper *wwrapper = MEM_mallocN(sizeof(wmGizmoWrapper), __func__); - wwrapper->gizmo = WM_gizmo_new("GIZMO_GT_grab_3d", gzgroup, NULL); + wwrapper->gizmo = WM_gizmo_new("GIZMO_GT_move_3d", gzgroup, NULL); wmGizmo *gz = wwrapper->gizmo; gzgroup->customdata = wwrapper; @@ -274,7 +274,7 @@ static void WIDGETGROUP_lamp_target_setup(const bContext *UNUSED(C), wmGizmoGrou wmOperatorType *ot = WM_operatortype_find("OBJECT_OT_transform_axis_target", true); RNA_enum_set(gz->ptr, "draw_options", - ED_GIZMO_GRAB_DRAW_FLAG_FILL | ED_GIZMO_GRAB_DRAW_FLAG_ALIGN_VIEW); + ED_GIZMO_MOVE_DRAW_FLAG_FILL | ED_GIZMO_MOVE_DRAW_FLAG_ALIGN_VIEW); WM_gizmo_operator_set(gz, 0, ot, NULL); } diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c index a234aa03482..66faac49304 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c @@ -203,7 +203,7 @@ static void WIDGETGROUP_navigate_setup(const bContext *UNUSED(C), wmGizmoGroup * const struct NavigateGizmoInfo *info = &g_navigate_params[i]; navgroup->gz_array[i] = WM_gizmo_new(info->gizmo, gzgroup, NULL); wmGizmo *gz = navgroup->gz_array[i]; - gz->flag |= WM_GIZMO_GRAB_CURSOR | WM_GIZMO_DRAW_MODAL; + gz->flag |= WM_GIZMO_MOVE_CURSOR | WM_GIZMO_DRAW_MODAL; if (i == MPR_ROTATE) { gz->color[3] = 0.0f; |