Merge branch 'master' into blender2.8
[blender.git] / source / blender / windowmanager / intern / wm_event_system.c
index 38f9a2bccae1d5a2f170f088d03b307f4e668388..b6a9115cca45797a5ce8faaa6bfe6a9ff429c5b6 100644 (file)
@@ -2180,7 +2180,7 @@ static int wm_handlers_do_intern(bContext *C, wmEvent *event, ListBase *handlers
 
                                PRINT("%s:   checking '%s' ...", __func__, keymap->idname);
 
-                               if (!keymap->poll || keymap->poll(C)) {
+                               if (WM_keymap_poll(C, keymap)) {
 
                                        PRINT("pass\n");