diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-19 15:11:35 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-19 15:11:35 +0400 |
| commit | 915c40708e033f20928ccfc0355534b691473369 (patch) | |
| tree | 8cfd2bf964e3574221e8aab519eec4d85512d66f /source/blender/windowmanager/intern/wm_keymap.c | |
| parent | 243e024a6316820a66f55a229cfca53e9895b759 (diff) | |
Fix #19640: user defined keymaps did not use poll function.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_keymap.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index eedacb056b7..3caca041be7 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -415,15 +415,19 @@ wmKeyMap *WM_keymap_active(wmWindowManager *wm, wmKeyMap *keymap) /* first user defined keymaps */ km= wm_keymap_list_find(&U.keymaps, keymap->idname, keymap->spaceid, keymap->regionid); - if(km) + if(km) { + km->poll= keymap->poll; /* lazy init */ return km; + } /* then user key config */ keyconf= wm_keyconfig_list_find(&wm->keyconfigs, U.keyconfigstr); if(keyconf) { km= wm_keymap_list_find(&keyconf->keymaps, keymap->idname, keymap->spaceid, keymap->regionid); - if(km) + if(km) { + km->poll= keymap->poll; /* lazy init */ return km; + } } /* then use default */ |