diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 15:57:17 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 15:57:17 +0300 |
commit | 97e7d9f90b31a0ede58e123bfec35d7fb1f913d4 (patch) | |
tree | 828bb6f45a491a8c22e006a09608aa126de90f0a /source/blender/windowmanager | |
parent | d97df0d0e682c56b0cc24e89398651d1d22e9ac3 (diff) | |
parent | 4127aeb7a5da5eeff8d6278b94f6302187ab0264 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager')
-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 fdca1d96b4b..37d594df688 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2559,8 +2559,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; |