[Bf-blender-cvs] [b560e15028b] master: Fix T68348: Hotkeys do nothing when over viewport gizmos
Campbell Barton
noreply at git.blender.org
Wed Aug 7 12:37:46 CEST 2019
Commit: b560e15028b1346f44d199466231491e8f80f023
Author: Campbell Barton
Date: Wed Aug 7 19:59:13 2019 +1000
Branches: master
https://developer.blender.org/rBb560e15028b1346f44d199466231491e8f80f023
Fix T68348: Hotkeys do nothing when over viewport gizmos
This was done intentionally so mouse press events tools didn't prevent gizmos
receiving click events before `USE_GIZMO_MOUSE_PRIORITY_HACK` was added.
===================================================================
M source/blender/editors/interface/view2d_gizmo_navigate.c
M source/blender/editors/space_view3d/view3d_gizmo_navigate.c
===================================================================
diff --git a/source/blender/editors/interface/view2d_gizmo_navigate.c b/source/blender/editors/interface/view2d_gizmo_navigate.c
index 1558d0d835f..883f16c63f2 100644
--- a/source/blender/editors/interface/view2d_gizmo_navigate.c
+++ b/source/blender/editors/interface/view2d_gizmo_navigate.c
@@ -179,9 +179,6 @@ static void WIDGETGROUP_navigate_setup(const bContext *UNUSED(C), wmGizmoGroup *
gz->ptr, "draw_options", ED_GIZMO_BUTTON_SHOW_OUTLINE | ED_GIZMO_BUTTON_SHOW_BACKDROP);
}
- /* Not needed, just match 3D view where it is needed. */
- WM_gizmo_set_flag(gz, WM_GIZMO_EVENT_HANDLE_ALL, true);
-
wmOperatorType *ot = WM_operatortype_find(info->opname, true);
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 1724a8bd86d..ad1a57eb71f 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_navigate.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate.c
@@ -184,10 +184,6 @@ static void WIDGETGROUP_navigate_setup(const bContext *C, wmGizmoGroup *gzgroup)
wmOperatorType *ot = WM_operatortype_find(info->opname, true);
WM_gizmo_operator_set(gz, 0, ot, NULL);
-
- /* We only need this for rotation so click/drag events aren't stolen
- * by paint mode press events, however it's strange if only rotation has this behavior. */
- WM_gizmo_set_flag(gz, WM_GIZMO_EVENT_HANDLE_ALL, true);
}
{
More information about the Bf-blender-cvs
mailing list