From 6dd9e08051d20e0c673660b2826470965e1eb8ca Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 7 Jun 2019 11:45:50 +1000 Subject: Keymap: gizmos now use a map that optionally activates on press The legacy keymap now activates on press. --- source/blender/editors/transform/transform_gizmo_3d.c | 8 ++++---- source/blender/editors/transform/transform_gizmo_extrude_3d.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/transform') diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index eef57824d7a..f886a953490 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -1993,7 +1993,7 @@ void VIEW3D_GGT_xform_gizmo(wmGizmoGroupType *gzgt) gzgt->poll = WIDGETGROUP_gizmo_poll_tool; gzgt->setup = WIDGETGROUP_gizmo_setup; - gzgt->setup_keymap = WM_gizmogroup_setup_keymap_generic_drag; + gzgt->setup_keymap = WM_gizmogroup_setup_keymap_generic_maybe_drag; gzgt->refresh = WIDGETGROUP_gizmo_refresh; gzgt->message_subscribe = WIDGETGROUP_gizmo_message_subscribe; gzgt->draw_prepare = WIDGETGROUP_gizmo_draw_prepare; @@ -2024,7 +2024,7 @@ void VIEW3D_GGT_xform_gizmo_context(wmGizmoGroupType *gzgt) gzgt->poll = WIDGETGROUP_gizmo_poll_context; gzgt->setup = WIDGETGROUP_gizmo_setup; - gzgt->setup_keymap = WM_gizmogroup_setup_keymap_generic_drag; + gzgt->setup_keymap = WM_gizmogroup_setup_keymap_generic_maybe_drag; gzgt->refresh = WIDGETGROUP_gizmo_refresh; gzgt->message_subscribe = WIDGETGROUP_gizmo_message_subscribe; gzgt->draw_prepare = WIDGETGROUP_gizmo_draw_prepare; @@ -2228,7 +2228,7 @@ void VIEW3D_GGT_xform_cage(wmGizmoGroupType *gzgt) gzgt->poll = WIDGETGROUP_xform_cage_poll; gzgt->setup = WIDGETGROUP_xform_cage_setup; - gzgt->setup_keymap = WM_gizmogroup_setup_keymap_generic_drag; + gzgt->setup_keymap = WM_gizmogroup_setup_keymap_generic_maybe_drag; gzgt->refresh = WIDGETGROUP_xform_cage_refresh; gzgt->message_subscribe = WIDGETGROUP_xform_cage_message_subscribe; gzgt->draw_prepare = WIDGETGROUP_xform_cage_draw_prepare; @@ -2412,7 +2412,7 @@ void VIEW3D_GGT_xform_shear(wmGizmoGroupType *gzgt) gzgt->poll = WIDGETGROUP_xform_shear_poll; gzgt->setup = WIDGETGROUP_xform_shear_setup; - gzgt->setup_keymap = WM_gizmogroup_setup_keymap_generic_drag; + gzgt->setup_keymap = WM_gizmogroup_setup_keymap_generic_maybe_drag; gzgt->refresh = WIDGETGROUP_xform_shear_refresh; gzgt->message_subscribe = WIDGETGROUP_xform_shear_message_subscribe; gzgt->draw_prepare = WIDGETGROUP_xform_shear_draw_prepare; diff --git a/source/blender/editors/transform/transform_gizmo_extrude_3d.c b/source/blender/editors/transform/transform_gizmo_extrude_3d.c index 9e8258bffb1..6ec4112acbb 100644 --- a/source/blender/editors/transform/transform_gizmo_extrude_3d.c +++ b/source/blender/editors/transform/transform_gizmo_extrude_3d.c @@ -463,7 +463,7 @@ void VIEW3D_GGT_xform_extrude(struct wmGizmoGroupType *gzgt) gzgt->poll = ED_gizmo_poll_or_unlink_delayed_from_tool; gzgt->setup = gizmo_mesh_extrude_setup; - gzgt->setup_keymap = WM_gizmogroup_setup_keymap_generic_drag; + gzgt->setup_keymap = WM_gizmogroup_setup_keymap_generic_maybe_drag; gzgt->refresh = gizmo_mesh_extrude_refresh; gzgt->draw_prepare = gizmo_mesh_extrude_draw_prepare; gzgt->invoke_prepare = gizmo_mesh_extrude_invoke_prepare; -- cgit v1.2.3