[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52004] trunk/blender/source/blender/ windowmanager/intern/wm_event_system.c: Small fix:

Ton Roosendaal ton at blender.org
Thu Nov 8 12:31:21 CET 2012


Revision: 52004
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52004
Author:   ton
Date:     2012-11-08 11:31:15 +0000 (Thu, 08 Nov 2012)
Log Message:
-----------
Small fix:

Pressing ESC for renders now checks for modifier keys, and doesn't escape renders
when a modifier key is held. In Windows, SHIFT+CTRL+ESC brings up task manager,
and it seems to pass on the event.

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

Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2012-11-08 10:32:11 UTC (rev 52003)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2012-11-08 11:31:15 UTC (rev 52004)
@@ -2978,9 +2978,10 @@
 			if (event.keymodifier == UNKNOWNKEY)
 				event.keymodifier = 0;
 			
-			/* if test_break set, it catches this. XXX Keep global for now? */
-			if (event.type == ESCKEY && event.val == KM_PRESS)
-				G.is_break = TRUE;
+			/* if test_break set, it catches this. Do not set with modifier presses. XXX Keep global for now? */
+			if (event.type == ESCKEY && event.val == KM_PRESS && 
+				event.shift == 0 && event.ctrl == 0 && event.alt == 0)
+					G.is_break = TRUE;
 			
 			/* double click test - only for press */
 			if (event.val == KM_PRESS) {




More information about the Bf-blender-cvs mailing list