From 5a6374f013f40ba8f78dfc33cc969ae711420c88 Mon Sep 17 00:00:00 2001
From: FakeShemp <sakcheen@gmail.com>
Date: Wed, 2 Mar 2016 10:57:22 +0100
Subject: [PATCH] Fix the remainder of errors. Might have borked splatmap in
 the process.

---
 assets                                 |  2 +-
 src/Engine/Editor/EditorSystem.cpp     |  3 ++-
 src/Engine/Rendering/DrawFinalPass.cpp | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/assets b/assets
index 1d09801c..72530423 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 1d09801cf45452e082ad08bac5e29e3102f31724
+Subproject commit 72530423ad3744341f42cbfdcba18295a2cfac90
diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp
index e770c154..0aefac9d 100644
--- a/src/Engine/Editor/EditorSystem.cpp
+++ b/src/Engine/Editor/EditorSystem.cpp
@@ -18,7 +18,8 @@ EditorSystem::EditorSystem(SystemParams params, IRenderer* renderer, RenderFrame
     m_ActualCamera = m_EditorCamera;
     m_EditorWorld->AttachComponent(m_EditorCamera.ID, "Transform");
 	auto cCamera = m_EditorWorld->AttachComponent(m_EditorCamera.ID, "Camera");
-	//(double&)cCamera["FarClip"] = 300.0;
+	// TOBIAS TVINGADE MIG ATT HÅRDKODA
+	(double&)cCamera["FarClip"] = 400.0;
 
     m_EditorCameraInputController = new EditorCameraInputController<EditorSystem>(m_EventBroker, -1);
 
diff --git a/src/Engine/Rendering/DrawFinalPass.cpp b/src/Engine/Rendering/DrawFinalPass.cpp
index ef930ca6..ac4fa8e4 100644
--- a/src/Engine/Rendering/DrawFinalPass.cpp
+++ b/src/Engine/Rendering/DrawFinalPass.cpp
@@ -368,6 +368,13 @@ void DrawFinalPass::DrawModelRenderQueues(std::list<std::shared_ptr<RenderJob>>&
 
 	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_2D, SSAOTexture);
+	glActiveTexture(GL_TEXTURE6);
+	if (m_ShadowPass->DepthMap() != NULL) {
+		glBindTexture(GL_TEXTURE_2D_ARRAY, m_ShadowPass->DepthMap());
+	}
+	else {
+		glBindTexture(GL_TEXTURE_2D_ARRAY, m_WhiteTexture->m_Texture);
+	}
 
     for (auto &job : jobs) {
         auto explosionEffectJob = std::dynamic_pointer_cast<ExplosionEffectJob>(job);
@@ -1017,13 +1024,6 @@ void DrawFinalPass::BindModelTextures(GLuint shaderHandle, std::shared_ptr<Model
 				glUniform2fv(glGetUniformLocation(shaderHandle, "GlowUVRepeat"), 1, glm::value_ptr(glm::vec2(1.0f, 1.0f)));
 			}
 
-			glActiveTexture(GL_TEXTURE6);
-			if (m_ShadowPass->DepthMap() != NULL) {
-				glBindTexture(GL_TEXTURE_2D_ARRAY, m_ShadowPass->DepthMap());
-			}
-			else {
-				glBindTexture(GL_TEXTURE_2D_ARRAY, m_WhiteTexture->m_Texture);
-			}
 			break;
 		}
 		case RawModel::MaterialType::SplatMapping: