Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGermano Cavalcante <germano.costa@ig.com.br>2020-11-30 19:11:46 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2020-11-30 20:50:35 +0300
commitc0677b662f4b13429c0738b99ace85403385ff38 (patch)
tree7a7c069bd1da2d6c587df4d5126b0d76ed872929 /source/blender/windowmanager
parent3bdc42f97a837766aec2bcd57917ef631570304f (diff)
Fix T83177: Industry Compatible keymap: MMB-dragging to transform engages axis-constraining on release
Release confirm did not consider modal keymap events.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/WM_api.h4
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c7
2 files changed, 11 insertions, 0 deletions
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:
*