Commit: 6974afba8259424d67bc1075547840cd8b2c2be6
Author: Campbell Barton
Date: Tue May 22 09:22:20 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB6974afba8259424d67bc1075547840cd8b2c2be6
WM: use keymap poll for manipulators
===================================================================
M source/blender/windowmanager/intern/wm_event_system.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_event_system.c
b/source/blender/windowmanager/intern/wm_event_system.c
index 46ea5bc137e..4d01927fb9e 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2391,12 +2391,12 @@ static int wm_handlers_do_intern(bContext *C, wmEvent
*event, ListBase *handlers
continue;
}
- const wmKeyMap *keymap =
WM_keymap_active(wm, mgroup->type->keymap);
+ wmKeyMap *keymap =
WM_keymap_active(wm, mgroup->type->keymap);
wmKeyMapItem *kmi;
PRINT("%s: checking '%s'
...", __func__, keymap->idname);
- if (!keymap->poll ||
keymap->poll(C)) {
+ if (WM_keymap_poll(C, keymap)) {
PRINT("pass\n");
for (kmi =
keymap->items.first; kmi; kmi = kmi->next) {
if
(wm_eventmatch(event, kmi)) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
