diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-03 21:53:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-03 21:54:52 +0300 |
| commit | 01244036afd560a58e27b186cc6e6676fe0aaebf (patch) | |
| tree | ec9f31021208e72884c2d62e0fa03086aa1d84f9 /source/blender/windowmanager/intern/wm_keymap.c | |
| parent | aef01c47e6334b214520f14c72b01de99387f122 (diff) | |
Fix T59049: some modal transform keys no working in custom keymaps.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_keymap.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 2d7814b0377..6048309980a 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -387,6 +387,7 @@ static wmKeyMap *wm_keymap_copy(wmKeyMap *keymap) keymapn->modal_items = keymap->modal_items; keymapn->poll = keymap->poll; + keymapn->poll_modal_item = keymap->poll_modal_item; BLI_listbase_clear(&keymapn->items); keymapn->flag &= ~(KEYMAP_UPDATE | KEYMAP_EXPANDED); @@ -868,6 +869,7 @@ wmKeyMap *WM_modalkeymap_add(wmKeyConfig *keyconf, const char *idname, const Enu if (defaultkm) { km->modal_items = defaultkm->modal_items; km->poll = defaultkm->poll; + km->poll_modal_item = defaultkm->poll_modal_item; } } @@ -977,6 +979,7 @@ static void wm_user_modal_keymap_set_items(wmWindowManager *wm, wmKeyMap *km) km->modal_items = defaultkm->modal_items; km->poll = defaultkm->poll; + km->poll_modal_item = defaultkm->poll_modal_item; if (km->modal_items) { for (kmi = km->items.first; kmi; kmi = kmi->next) { @@ -1629,6 +1632,7 @@ void WM_keyconfig_update(wmWindowManager *wm) if (kmn) { kmn->modal_items = km->modal_items; kmn->poll = km->poll; + kmn->poll_modal_item = km->poll_modal_item; } /* in case of old non-diff keymaps, force extra update to create diffs */ |