Merge branch 'master' into blender2.8

2018-07-16 17:34:10 +02:00 · 2018-07-16 17:34:10 +02:00 · 5852420023
parent dc123ac9e5 e6af8758c8
commit 5852420023
1 changed files with 1 additions and 1 deletions
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@ -261,7 +261,7 @@ GHOST_SystemX11::
 #endif /* WITH_X11_XINPUT */

 	if (m_xkb_descr) {
-		XkbFreeNames(m_xkb_descr, XkbKeyNamesMask, false);
+		XkbFreeKeyboard (m_xkb_descr, XkbAllComponentsMask, true);
 	}

 	XCloseDisplay(m_display);