diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 23:19:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 23:19:39 +0300 |
| commit | 528dc6440bb41e6cbfeea62756ba5ae5debcd27f (patch) | |
| tree | 9b5e5310e4d52b196df3ae52713538a75ea9d552 | |
| parent | d1ab958fd48168e02ca52ee9cdc05326e010662f (diff) | |
| parent | 5165d6293153fd622e11c2f9f991a8693b765ccb (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 37d594df688..1e3a08bdcbc 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2549,7 +2549,9 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers) } } } - else if (!ELEM(event->type, EVENT_NONE) && !ISTIMER(event->type)) { + else if (ISMOUSE(event->type) || ISKEYBOARD(event->type)) { + /* All events that don't set wmEvent.prevtype must be ignored. */ + /* test for CLICK events */ if (wm_action_not_handled(action)) { wmWindow *win = CTX_wm_window(C); @@ -2559,11 +2561,8 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers) if (win != NULL) { if (event->val == KM_PRESS) { - /* Ensure the types match to prevent mouse wheel from triggering drag/clicks. */ - if (event->type == win->eventstate->prevtype) { - win->eventstate->check_click = true; - win->eventstate->check_drag = true; - } + win->eventstate->check_click = true; + win->eventstate->check_drag = true; } else if (event->val == KM_RELEASE) { win->eventstate->check_drag = false; |