Merge remote-tracking branch 'origin/master' into HealthPickup

2016-02-17 14:30:31 +01:00
parent b13362360a 0af9edc6e5
commit ac9ce8ea83
1 changed files with 2 additions and 0 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();
    }
 }