[Bf-blender-cvs] [b492a0e7671] blender2.8: Merge branch 'master' into blender2.8

Campbell Barton noreply at git.blender.org
Sat Jun 9 11:29:08 CEST 2018


Commit: b492a0e7671a0b09ab2d9b8b9d81c28481e44753
Author: Campbell Barton
Date:   Sat Jun 9 11:27:22 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb492a0e7671a0b09ab2d9b8b9d81c28481e44753

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc intern/ghost/intern/GHOST_SystemX11.cpp
index ebfa3013ec8,6d28310baaf..e50df358cb2
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@@ -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) {



More information about the Bf-blender-cvs mailing list