From 95a67bf0c24d5c0923b0e8df9415e1a720a62982 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 10 Oct 2016 18:17:40 +0200
Subject: [PATCH] Disable OSG 3.5.5 thread affinity setting in the scenewidget
 due to the interference with QT threads

Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158
---
 apps/opencs/view/render/scenewidget.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index db0637a24..4655ee957 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -10,6 +10,7 @@
 #include <osgViewer/CompositeViewer>
 #include <osgViewer/ViewerEventHandlers>
 #include <osg/LightModel>
+#include <osg/Version>
 
 #include <components/resource/scenemanager.hpp>
 #include <components/resource/resourcesystem.hpp>
@@ -130,6 +131,10 @@ CompositeViewer::CompositeViewer()
 
     setThreadingModel(threadingModel);
 
+#if OSG_VERSION_GREATER_OR_EQUAL(3,5,5)
+    setUseConfigureAffinity(false);
+#endif
+
     // disable the default setting of viewer.done() by pressing Escape.
     setKeyEventSetsDone(0);