From 6da6c9922176cc9bf07b57ec5d70fd509a739fce Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Thu, 8 Nov 2012 11:31:15 +0000 Subject: 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. --- source/blender/windowmanager/intern/wm_event_system.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 7cfa3ce9396..236ab264f8c 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2978,9 +2978,10 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U 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) { -- cgit v1.2.3