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

# Conflicts: # include/Engine/Rendering/RenderSystem.h # src/Engine/Rendering/RenderSystem.cpp
2016-01-22 17:02:56 +01:00
parent ea9c4d19d0 8cf83454d7
commit 46dff1a59c
95 changed files with 2515 additions and 1282 deletions
@@ -11,7 +11,6 @@
 #include "FrameBuffer.h"
 #include "../Core/World.h"
 #include "PickingPass.h"
-#include "DrawScenePass.h"
 #include "LightCullingPass.h"
 #include "DrawFinalPass.h"
 #include "../Core/EventBroker.h"
@@ -46,7 +45,6 @@ private:
    Model* m_UnitQuad;
    Model* m_UnitSphere;

-    DrawScenePass* m_DrawScenePass;
    PickingPass* m_PickingPass;
    LightCullingPass* m_LightCullingPass;
    ImGuiRenderPass* m_ImGuiRenderPass;