From c0677b662f4b13429c0738b99ace85403385ff38 Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Mon, 30 Nov 2020 13:11:46 -0300 Subject: Fix T83177: Industry Compatible keymap: MMB-dragging to transform engages axis-constraining on release Release confirm did not consider modal keymap events. --- source/blender/windowmanager/WM_api.h | 4 ++++ source/blender/windowmanager/intern/wm_event_system.c | 7 +++++++ 2 files changed, 11 insertions(+) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index fd0b99fb9ae..47c5487a458 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -47,6 +47,7 @@ struct ImBuf; struct ImageFormatData; struct Main; struct MenuType; +struct Operator; struct PointerRNA; struct PropertyRNA; struct ScrArea; @@ -255,6 +256,9 @@ void WM_event_set_keymap_handler_post_callback(struct wmEventHandler_Keymap *han wmKeyMap *WM_event_get_keymap_from_handler(wmWindowManager *wm, struct wmEventHandler_Keymap *handler); +wmKeyMapItem *WM_event_match_modal_keymap_item(const wmKeyMap *keymap, + struct wmOperator *op, + const struct wmEvent *event); wmKeyMapItem *WM_event_match_keymap_item(struct bContext *C, wmKeyMap *keymap, const struct wmEvent *event); diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 1bd8c675807..587abf6fa0a 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1911,6 +1911,13 @@ static wmKeyMapItem *wm_eventmatch_modal_keymap_items(const wmKeyMap *keymap, return NULL; } +wmKeyMapItem *WM_event_match_modal_keymap_item(const wmKeyMap *keymap, + wmOperator *op, + const wmEvent *event) +{ + return wm_eventmatch_modal_keymap_items(keymap, op, event); +} + /** * This function prepares events for use with #wmOperatorType.modal by: * -- cgit v1.2.3