diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-02-04 22:59:35 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-02-04 22:59:35 +0300 |
| commit | 54a4e9b697e28dba5340709f94374754f41b4884 (patch) | |
| tree | 90f61ca65f92cf62ca696bc5788ff70623e94284 /source/blender/windowmanager | |
| parent | 15bb6e63e8f7a04cbfc50d51466ddc19253bc52b (diff) | |
| parent | 36d09d9029c970de6a6c4d926fc1189865b145c3 (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 5 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 4b525189368..705b3e90523 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -4998,8 +4998,9 @@ void WM_window_cursor_keymap_status_refresh(bContext *C, wmWindow *win) * * \{ */ -bool WM_window_modal_keymap_status_draw(bContext *UNUSED(C), wmWindow *win, uiLayout *layout) +bool WM_window_modal_keymap_status_draw(bContext *C, wmWindow *win, uiLayout *layout) { + wmWindowManager *wm = CTX_wm_manager(C); wmKeyMap *keymap = NULL; wmOperator *op = NULL; LISTBASE_FOREACH (wmEventHandler *, handler_base, &win->modalhandlers) { @@ -5007,7 +5008,7 @@ bool WM_window_modal_keymap_status_draw(bContext *UNUSED(C), wmWindow *win, uiLa wmEventHandler_Op *handler = (wmEventHandler_Op *)handler_base; if (handler->op != NULL) { /* 'handler->keymap' could be checked too, seems not to be used. */ - wmKeyMap *keymap_test = handler->op->type->modalkeymap; + wmKeyMap *keymap_test = WM_keymap_active(wm, handler->op->type->modalkeymap); if (keymap_test && keymap_test->modal_items) { keymap = keymap_test; op = handler->op; diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index f5e507fc317..68a12fa4272 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -1291,7 +1291,9 @@ int WM_modalkeymap_operator_items_to_string(wmOperatorType *ot, char *result, const int result_len) { - return WM_modalkeymap_items_to_string(ot->modalkeymap, propvalue, compact, result, result_len); + wmWindowManager *wm = G_MAIN->wm.first; + wmKeyMap *keymap = WM_keymap_active(wm, ot->modalkeymap); + return WM_modalkeymap_items_to_string(keymap, propvalue, compact, result, result_len); } char *WM_modalkeymap_operator_items_to_string_buf(wmOperatorType *ot, |