diff options
| author | Ton Roosendaal <ton@blender.org> | 2012-11-08 15:31:15 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2012-11-08 15:31:15 +0400 |
| commit | 6da6c9922176cc9bf07b57ec5d70fd509a739fce (patch) | |
| tree | d00fff34addc2e46ec4007eadefa038ae0f476e4 /source/blender/windowmanager | |
| parent | ae06e2cf9b932dc2b9d182aba8b7d1c62cc7f235 (diff) | |
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.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 7 |
1 files changed, 4 insertions, 3 deletions
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) { |