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

Conflicts: src/Engine/Rendering/DrawFinalPass.cpp
2016-03-01 12:56:00 +01:00
parent 8cda614de4 dfa224b4dd
commit 724d7b1586
1 changed files with 2 additions and 0 deletions
@@ -189,6 +189,8 @@ void DrawFinalPass::Draw(RenderScene& scene)
    GLERROR("OpaqueObjects");
    //state->BlendFunc(GL_ONE, GL_ONE);
    state->BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+    //state->BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	DrawModelRenderQueues(scene.Jobs.TransparentObjects, scene);
    GLERROR("TransparentObjects");
    //state->BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);