Merge remote-tracking branch 'origin/master' into Forward+

# Conflicts: # src/Engine/Rendering/DrawFinalPassState.cpp # src/Engine/Rendering/PickingPass.cpp # src/Engine/Rendering/Renderer.cpp
2016-01-22 15:57:38 +01:00
parent 2b8debbfff 8cf83454d7
commit 7498cebf5e
134 changed files with 5114 additions and 2253 deletions
@@ -9,7 +9,6 @@ DrawFinalPassState::DrawFinalPassState()
    Enable(GL_DEPTH_TEST);
    Enable(GL_CULL_FACE);
    ClearColor(glm::vec4(155.f / 255, 0.f / 255, 155.f / 255, 0.f));
-    Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 }

 DrawFinalPassState::~DrawFinalPassState()