diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-13 23:01:32 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-13 23:02:40 +0300 |
| commit | 520f71b43a4b24fb7c59d5798657cb7afb552ecf (patch) | |
| tree | 2c974e2fb8a50d68604a13bdbc3ad9e9c0ea9cb6 /source/blender/windowmanager/intern/wm_keymap.c | |
| parent | f9145bded3d0049190a0a6af7ad661a1403e6ce2 (diff) | |
Fix tool keymaps not working properly after recent changes.
Not sure this is the best fix, but this should be working. Regardless it seems
good to tag active tool keymaps as such.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_keymap.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 4032f47eec2..2685a1bfafd 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -267,7 +267,10 @@ wmKeyConfig *WM_keyconfig_new(wmWindowManager *wm, const char *idname, bool user /* For default configuration, we need to keep keymap * modal items and poll functions intact. */ for (wmKeyMap *km = keyconf->keymaps.first; km; km = km->next) { - WM_keymap_clear(km); + /* Tool system keymaps are not part of preset, so don't clear. */ + if (!(km->flag & KEYMAP_TOOL)) { + WM_keymap_clear(km); + } } } else { |