Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2018-06-14 19:14:17 +0300
committerClément Foucault <foucault.clem@gmail.com>2018-06-14 19:17:28 +0300
commit2e09b277d51bc03a3a38c78aacf82cb106f03ada (patch)
treeead243e2055e5b281d8aa771ae1ce5d981afb171 /intern
parentdc856be8399242f4ee3a2ce0450b7ac5a20b35f6 (diff)
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.
Diffstat (limited to 'intern')
-rw-r--r--intern/ghost/intern/GHOST_SystemX11.cpp1
1 files changed, 1 insertions, 0 deletions
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) {