Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Small fix:

Browse Source 
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.
This commit is contained in:
Ton Roosendaal
2012-11-08 11:31:15 +00:00
parent ae06e2cf9b
commit 6da6c99221
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -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) {