diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-03-01 18:14:59 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-03-01 18:14:59 +0300 |
| commit | ef648f617e6cb0fbcd1c0a39ef711573ecf230ee (patch) | |
| tree | 8fbf7668eb5633675c861f1238ef46152842d29a /intern/ghost | |
| parent | 623822626a954fe9f83f18af4b3699c6e80b5313 (diff) | |
Fix [#25476] Pan view not always works with shift+alt+LMB in Blender 2.56
Reported by Mihail Konoh
Applied patch submitted by Alexander Kuznetsov (to [#26208]). Thanks for long-standing head-ache :)
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index b1c79247265..2dee44272be 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -752,13 +752,14 @@ GHOST_EventKey* GHOST_SystemWin32::processKeyEvent(GHOST_IWindow *window, bool k if (key != GHOST_kKeyUnknown) { MSG keyMsg; char ascii = '\0'; - /* Eat any character related messages */ - if (::PeekMessage(&keyMsg, NULL, WM_CHAR, WM_SYSDEADCHAR, PM_REMOVE)) { - ascii = (char) keyMsg.wParam; - - } + if (::PeekMessage(&keyMsg, NULL, WM_CHAR, WM_DEADCHAR, PM_REMOVE) || + ::PeekMessage(&keyMsg, NULL, WM_SYSCHAR, WM_SYSDEADCHAR, PM_REMOVE)) + { + ascii = (char) keyMsg.wParam; + if(ascii > 126) ascii = 0; + }; event = new GHOST_EventKey(getSystem()->getMilliSeconds(), keyDown ? GHOST_kEventKeyDown: GHOST_kEventKeyUp, window, key, ascii); #ifdef BF_GHOST_DEBUG |