diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-31 14:00:19 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-31 14:00:19 +0300 |
| commit | 3f2090f401f2e0c63fc25a4be72d342a564cff2e (patch) | |
| tree | 7e25dbc75256ab77824b4607398950af8e54c530 /intern | |
| parent | f18de82cd41ad04c29ee711e7b80b13b67505493 (diff) | |
| parent | 671c54f692f632b29dd56d444dc4bc369c92de59 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 5d383f68e9d..37a2c50c442 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -1903,7 +1903,7 @@ ghost_key_from_keycode(const XkbDescPtr xkb_descr, const KeyCode keycode) #endif } } - else { + else if (keycode != 0) { GHOST_ASSERT(false, "KeyCode out of range!"); } return GHOST_kKeyUnknown; |