[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57823] trunk/blender/source/blender/ windowmanager/intern: Fix #35809: dragging a non-active node in the node editor did not work reliably.

Brecht Van Lommel brechtvanlommel at pandora.be
Thu Jun 27 17:07:28 CEST 2013


Revision: 57823
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57823
Author:   blendix
Date:     2013-06-27 15:07:27 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2013-06-27 14:30:26 UTC (rev 57822)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2013-06-27 15:07:27 UTC (rev 57823)
@@ -1922,7 +1922,7 @@
 	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)) {

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2013-06-27 14:30:26 UTC (rev 57822)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2013-06-27 15:07:27 UTC (rev 57823)
@@ -3021,7 +3021,7 @@
 			}
 			break;
 		default:
-			if (!ISTIMER(event->type)) {
+			if (!ISTIMER(event->type) && event->type != EVENT_NONE) {
 				WM_gesture_end(C, gesture);
 			}
 			break;




More information about the Bf-blender-cvs mailing list