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

# Conflicts:
#	src/Engine/Rendering/DrawFinalPassState.cpp
#	src/Engine/Rendering/PickingPass.cpp
#	src/Engine/Rendering/Renderer.cpp
This commit is contained in:
Tleety
2016-01-22 15:57:38 +01:00
134 changed files with 5114 additions and 2253 deletions
+3
View File
@@ -52,6 +52,9 @@ void PickingPass::Draw(RenderScene& scene)
GLuint ShaderHandle = m_PickingProgram->GetHandle();
m_PickingProgram->Bind();
if (scene.ClearDepth) {
glClear(GL_DEPTH_BUFFER_BIT);
}
m_Camera = scene.Camera;
for (auto &job : scene.ForwardJobs) {