diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 15:09:45 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 15:09:45 +0300 |
| commit | fb1915d87090a120233ad58b59b953e674e21208 (patch) | |
| tree | c95cfd65c11b01215fc543fe88755331bd494839 /source | |
| parent | 7b6af843c2bdef9c9ab6d00100d93192a8e769c0 (diff) | |
Prevent wheel causing spurious click/drag events
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index b9feb4cba09..8693fd401a8 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2284,8 +2284,11 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers) if (win != NULL) { if (event->val == KM_PRESS) { - win->eventstate->check_click = true; - win->eventstate->check_drag = true; + /* 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; + } } else if (event->val == KM_RELEASE) { win->eventstate->check_drag = false; |