From 55f002ad6fce141b88329430eb3327713c196cfb Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@me.com>
Date: Wed, 1 Mar 2017 10:39:29 -0500
Subject: [PATCH] Move the disabling of the rendering on the master into the
 RenderEngine instead of specifying it in the OpenSpaceEngine

---
 include/openspace/rendering/renderengine.h |  2 --
 openspace.cfg                              |  1 +
 src/engine/openspaceengine.cpp             |  7 -------
 src/rendering/renderengine.cpp             | 10 ++++++----
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h
index da40e6b3c8..d93b5a000f 100644
--- a/include/openspace/rendering/renderengine.h
+++ b/include/openspace/rendering/renderengine.h
@@ -111,8 +111,6 @@ public:
     float globalBlackOutFactor();
     void setGlobalBlackOutFactor(float factor);
 
-    void setDisableRenderingOnMaster(bool enabled);
-
     void registerScreenSpaceRenderable(std::shared_ptr<ScreenSpaceRenderable> s);
     void unregisterScreenSpaceRenderable(std::shared_ptr<ScreenSpaceRenderable> s);
     void unregisterScreenSpaceRenderable(std::string name);
diff --git a/openspace.cfg b/openspace.cfg
index b52e8abbc5..a1de1e185d 100644
--- a/openspace.cfg
+++ b/openspace.cfg
@@ -85,6 +85,7 @@ return {
     ShutdownCountdown = 3,
     -- OnScreenTextScaling = "framebuffer",
     -- PerSceneCache = true,
+    -- DisableRenderingOnMaster = true,
     DownloadRequestURL = "http://data.openspaceproject.com/request.cgi",
     RenderingMethod = "Framebuffer"
     --RenderingMethod = "ABuffer" -- alternative: "Framebuffer"
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index a2b443b5c1..bb000a8594 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -475,13 +475,6 @@ void OpenSpaceEngine::initialize() {
 
     writeDocumentation();
 
-    if (configurationManager().hasKey(ConfigurationManager::KeyDisableMasterRendering)) {
-        const bool disableMasterRendering = configurationManager().value<bool>(
-            ConfigurationManager::KeyDisableMasterRendering
-        );
-        _renderEngine->setDisableRenderingOnMaster(disableMasterRendering);
-    }
-
     if (configurationManager().hasKey(ConfigurationManager::KeyShutdownCountdown)) {
         _shutdown.waitTime = configurationManager().value<double>(
             ConfigurationManager::KeyShutdownCountdown
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 83e972ea41..4ca1b522b4 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -194,6 +194,12 @@ void RenderEngine::initialize() {
             renderingMethod = "Framebuffer";
         }
     }
+    
+    if (confManager.hasKey(ConfigurationManager::KeyDisableMasterRendering)) {
+        _disableMasterRendering = confManager.value<bool>(
+            ConfigurationManager::KeyDisableMasterRendering
+        );
+    }
 
     _raycasterManager = new RaycasterManager();
     _nAaSamples = OsEng.windowWrapper().currentNumberOfAaSamples();
@@ -784,10 +790,6 @@ performance::PerformanceManager* RenderEngine::performanceManager() {
     return _performanceManager.get();
 }
 
-void RenderEngine::setDisableRenderingOnMaster(bool enabled) {
-    _disableMasterRendering = enabled;
-}
-
 void RenderEngine::registerScreenSpaceRenderable(std::shared_ptr<ScreenSpaceRenderable> s)
 {
     s->initialize();