[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53658] trunk/blender/source/blender/ windowmanager/intern/wm_window.c: Bugfix #33803

Ton Roosendaal ton at blender.org
Tue Jan 8 15:40:22 CET 2013


Revision: 53658
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53658
Author:   ton
Date:     2013-01-08 14:40:15 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
Bugfix #33803

(2.65a and older)

Case: ALT+CTRL+U (user prefs) made mousewheel change button values in inactive
window.

On opening 2nd window, or de-activating a window, the modifier
state was kept for that window. That meant that mouse-over in a window was using
the old modifier - for example for scrollwheel it would change values
in buttons.

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

Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c	2013-01-08 14:25:17 UTC (rev 53657)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c	2013-01-08 14:40:15 UTC (rev 53658)
@@ -701,6 +701,14 @@
 			case GHOST_kEventWindowDeactivate:
 				wm_event_add_ghostevent(wm, win, type, time, data);
 				win->active = 0; /* XXX */
+				
+				/* clear modifiers for inactive windows */
+				win->eventstate->alt = 0;
+				win->eventstate->ctrl = 0;
+				win->eventstate->shift = 0;
+				win->eventstate->oskey = 0;
+				win->eventstate->keymodifier = 0;
+
 				break;
 			case GHOST_kEventWindowActivate: 
 			{




More information about the Bf-blender-cvs mailing list