From 8cda614de456ef9103bed064deeae39260f1419a Mon Sep 17 00:00:00 2001
From: Teejoon <jofrwito@hotmail.com>
Date: Tue, 1 Mar 2016 12:54:01 +0100
Subject: [PATCH] Added transparent object that disappeared from the merge

---
 src/Engine/Rendering/DrawFinalPass.cpp    | 2 +-
 src/Engine/Rendering/PickingPassState.cpp | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Engine/Rendering/DrawFinalPass.cpp b/src/Engine/Rendering/DrawFinalPass.cpp
index 6b600d22..29499c79 100644
--- a/src/Engine/Rendering/DrawFinalPass.cpp
+++ b/src/Engine/Rendering/DrawFinalPass.cpp
@@ -189,7 +189,7 @@ void DrawFinalPass::Draw(RenderScene& scene)
     GLERROR("OpaqueObjects");
     //state->BlendFunc(GL_ONE, GL_ONE);
     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);
     DrawSprites(scene.Jobs.SpriteJob, scene);
diff --git a/src/Engine/Rendering/PickingPassState.cpp b/src/Engine/Rendering/PickingPassState.cpp
index 3c19dc06..767b9577 100644
--- a/src/Engine/Rendering/PickingPassState.cpp
+++ b/src/Engine/Rendering/PickingPassState.cpp
@@ -9,7 +9,6 @@ PickingPassState::PickingPassState(GLuint frameBuffer)
     Enable(GL_DEPTH_TEST);
     Enable(GL_CULL_FACE);
     Disable(GL_BLEND);
-
     glm::vec4 clearColor = glm::vec4(0.f);
     //ClearColor(clearColor);
     //Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);