diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-27 19:07:27 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-27 19:07:27 +0400 |
commit | 4d5fffa1a9ed9cafcd29e62e43ba62f1f2625454 (patch) | |
tree | 55044e175b19cdc08e939f0bfac0c89c97f2fe3f /source/blender/windowmanager | |
parent | 2403a2395391b74c6960bc1735f75c15e4886ecd (diff) |
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.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index d94cfaa5aee..5b469a6c50f 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1922,7 +1922,7 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers) if (CTX_wm_window(C) == NULL) 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 */ if (wm_action_not_handled(action)) { diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index b9f618c245c..9e0cb6a1d38 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3021,7 +3021,7 @@ static void tweak_gesture_modal(bContext *C, const wmEvent *event) } break; default: - if (!ISTIMER(event->type)) { + if (!ISTIMER(event->type) && event->type != EVENT_NONE) { WM_gesture_end(C, gesture); } break; |