Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 9 Jun 2018 09:27:22 +0000 (11:27 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 9 Jun 2018 09:27:22 +0000 (11:27 +0200)
1  2 
intern/ghost/intern/GHOST_SystemX11.cpp
intern/ghost/intern/GHOST_SystemX11.h

index ebfa3013ec83ab6555a2178a45c4053feb56f68e,6d28310baaf380939def145bef0ef0d579a59229..e50df358cb299f451b0dc83b846fa37e8e406d6c
@@@ -117,9 -116,9 +122,10 @@@ GHOST_SystemX11:
  GHOST_SystemX11(
          )
      : GHOST_System(),
+       m_xkb_descr(NULL),
        m_start_time(0)
  {
 +      XInitThreads();
        m_display = XOpenDisplay(NULL);
  
        if (!m_display) {
Simple merge