[Bf-blender-cvs] [2e09b277d51] blender2.8: Revert "GHOST: GLX: Remove XInitThreads"

Clément Foucault noreply at git.blender.org
Thu Jun 14 18:21:24 CEST 2018


Commit: 2e09b277d51bc03a3a38c78aacf82cb106f03ada
Author: Clément Foucault
Date:   Thu Jun 14 18:14:17 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB2e09b277d51bc03a3a38c78aacf82cb106f03ada

Revert "GHOST: GLX: Remove XInitThreads"

This reverts commit 7529690df38ced314d59af3b10c610e3fd56c807.

I tried to put manually add threading protection to GHOST around
Xlib calls but that did not fix the crashes. So reverting that
for now despite the performance implication on some system.

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

M	intern/ghost/intern/GHOST_SystemX11.cpp

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

diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 1efbee0e6aa..fcda5d8b72d 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -125,6 +125,7 @@ GHOST_SystemX11(
       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