diff options
| author | Julian Eisel <julian@blender.org> | 2020-08-10 19:30:53 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-08-10 19:30:53 +0300 |
| commit | 784adccf470b6ccea30d8ee63fdcd5aa8dd4326c (patch) | |
| tree | 6c828af0c9905a76300ce9e3c23e82e961f49cd3 /intern/ghost | |
| parent | c521b69ffb68df17d6b8e1c71d23924a8b9b9cf3 (diff) | |
| parent | 8ef05d3180b1b54c7647d059a1f8a6c610937bc9 (diff) | |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index db26bd6a614..f59b106afd6 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -1143,9 +1143,11 @@ GHOST_EventKey *GHOST_SystemWin32::processKeyEvent(GHOST_WindowWin32 *window, RA BYTE state[256] = {0}; int r; GetKeyboardState((PBYTE)state); + bool ctrl_pressed = state[VK_CONTROL] & 0x80; + bool alt_pressed = state[VK_MENU] & 0x80; - /* No text with control key pressed. */ - if (state[VK_CONTROL] & 0x80) { + /* No text with control key pressed (Alt can be used to insert special characters though!). */ + if (ctrl_pressed && !alt_pressed) { utf8_char[0] = '\0'; } // Don't call ToUnicodeEx on dead keys as it clears the buffer and so won't allow diacritical |