forked from bartvdbraak/blender
Fix #35809: dragging a non-active node in the node editor did not work reliably.
Disabled timer events from the properties editor were cancelling gestures.
This commit is contained in:
parent
2403a23953
commit
4d5fffa1a9
@ -1922,7 +1922,7 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
|
|||||||
if (CTX_wm_window(C) == NULL)
|
if (CTX_wm_window(C) == NULL)
|
||||||
return action;
|
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 */
|
/* test for CLICK events */
|
||||||
if (wm_action_not_handled(action)) {
|
if (wm_action_not_handled(action)) {
|
||||||
|
@ -3021,7 +3021,7 @@ static void tweak_gesture_modal(bContext *C, const wmEvent *event)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (!ISTIMER(event->type)) {
|
if (!ISTIMER(event->type) && event->type != EVENT_NONE) {
|
||||||
WM_gesture_end(C, gesture);
|
WM_gesture_end(C, gesture);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user