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

# Conflicts: # resources/Schema/Entities/NewMap.xml
2016-02-17 16:59:26 +01:00
parent 833015f45e 0d665c10fe
commit 8845054965
5 changed files with 25 additions and 13 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();
    }
 }