Merging r57816 through r57896 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / windowmanager / intern / wm_event_system.c
index df5de47fb3bdb33d211b529530a0c6a619b9dd1a..b9455601ede4e76db1fbbbde716f3ca8e342970e 100644 (file)
@@ -1939,7 +1939,7 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
        if (CTX_wm_window(C) == NULL)
                return action;
 
-       if (!ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE) && !ISTIMER(event->type)) {
+       if (!ELEM3(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE, EVENT_NONE) && !ISTIMER(event->type)) {
 
                /* test for CLICK events */
                if (wm_action_not_handled(action)) {