Merge remote-tracking branch 'origin/master' into FriendlyHost/Join

2016-02-17 15:52:58 +01:00
parent fdc8f753cb 0d665c10fe
commit 950ecba1c0
5 changed files with 26 additions and 14 deletions
@@ -43,6 +43,8 @@ EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame
    m_Enabled = ResourceManager::Load<ConfigFile>("Config.ini")->Get<bool>("Debug.EditorEnabled", false);
    if (m_Enabled) {
        Enable();
+    } else {
+        Disable();
    }
 }