diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-07 21:41:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-07 21:41:10 +0300 |
| commit | cfc4805455bc03f5f810d0d234880727284e93cf (patch) | |
| tree | 4739036dbf710d53389ef98b611e9c8e1e3d361e /intern | |
| parent | 18e316bcb9f4aa7221f82a40fd3307cde7eaffbb (diff) | |
| parent | 8f49299134b504a59558aad8e66a81ae3c6c9748 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 42bb05c0177..5d14ff5bb93 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -669,10 +669,8 @@ processEvents( } /* dispatch event to XIM server */ - if ((XFilterEvent(&xevent, (Window)NULL) == True) && (xevent.type != KeyRelease)) { - /* do nothing now, the event is consumed by XIM. - * however, KeyRelease event should be processed - * here, otherwise modifiers remain activated. */ + if ((XFilterEvent(&xevent, (Window)NULL) == True)) { + /* do nothing now, the event is consumed by XIM. */ continue; } #endif |