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

# Conflicts: # include/Engine/Rendering/RenderSystem.h # resources/Schema/Entities/RenderingWorld.xml # resources/Shaders/ForwardPlus.frag.glsl # src/Engine/Rendering/RenderSystem.cpp
2016-01-24 20:48:17 +01:00
parent aa3b8cd652 f80fb5eda8
commit ada1bac2a7
105 changed files with 4323 additions and 861 deletions
@@ -39,7 +39,7 @@ void EditorRenderSystem::Update(double dt)
                continue;
            } catch (const std::exception&) {
                try {
-                    model = ResourceManager::Load<::Model>("Models/Core/Error.obj");
+                    model = ResourceManager::Load<::Model>("Models/Core/Error.mesh");
                } catch (const std::exception&) {
                    continue;
                }