Fix #19842: timer events incorrectly cancelled tweak events, e.g. when
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 11 Nov 2009 15:29:22 +0000 (15:29 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 11 Nov 2009 15:29:22 +0000 (15:29 +0000)
opening a file browser.

source/blender/windowmanager/intern/wm_operators.c

index 22c5f1c15aee92966dcad4001ef4c1c12277cc59..f8febdcd8989a3b993ef81705679728d241eb3e9 100644 (file)
@@ -1810,8 +1810,11 @@ static void tweak_gesture_modal(bContext *C, wmEvent *event)
                        }
                        break;
                default:
-                       WM_gesture_end(C, gesture);
-                       window->tweak= NULL;
+                       if(!ISTIMER(event->type)) {
+                               WM_gesture_end(C, gesture);
+                               window->tweak= NULL;
+                       }
+                       break;
        }
 }