blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-06-08 22:19:39 +02:00
parent d1ab958fd4 5165d62931
commit 528dc6440b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/windowmanager/intern/wm_event_system.c
View File

@ -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;