From edaac1ded4943c9d483ce0bc6fc3ad49fba77edf Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Sat, 1 Mar 2014 12:55:43 +0100
Subject: [PATCH] Fixed last commit

Thanks to Raakz for his patience


Former-commit-id: 4b423f3d271fcbdc3e33937e8170843681a3b096
---
 src/Nazara/Graphics/Loaders/Mesh/Loader.cpp | 2 --
 src/Nazara/Graphics/Loaders/OBJ/Loader.cpp  | 2 +-
 src/Nazara/Graphics/Model.cpp               | 4 ----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Nazara/Graphics/Loaders/Mesh/Loader.cpp b/src/Nazara/Graphics/Loaders/Mesh/Loader.cpp
index 6761be3a2..26c4b118e 100644
--- a/src/Nazara/Graphics/Loaders/Mesh/Loader.cpp
+++ b/src/Nazara/Graphics/Loaders/Mesh/Loader.cpp
@@ -66,8 +66,6 @@ namespace
 
 					if (material->LoadFromFile(mat, parameters.material))
 					{
-						material->SetShader(parameters.shaderName);
-
 						model->SetMaterial(i, material.get());
 						material.release();
 					}
diff --git a/src/Nazara/Graphics/Loaders/OBJ/Loader.cpp b/src/Nazara/Graphics/Loaders/OBJ/Loader.cpp
index 6f3b09771..3d939f7ea 100644
--- a/src/Nazara/Graphics/Loaders/OBJ/Loader.cpp
+++ b/src/Nazara/Graphics/Loaders/OBJ/Loader.cpp
@@ -212,7 +212,7 @@ namespace
 								std::unique_ptr<NzMaterial> material(new NzMaterial);
 								material->SetPersistent(false);
 
-								material->SetShader(parameters.shaderName);
+								material->SetShader(parameters.material.shaderName);
 
 								nzUInt8 alphaValue = static_cast<nzUInt8>(mtlMat->alpha*255.f);
 
diff --git a/src/Nazara/Graphics/Model.cpp b/src/Nazara/Graphics/Model.cpp
index 23cd89b5e..301424263 100644
--- a/src/Nazara/Graphics/Model.cpp
+++ b/src/Nazara/Graphics/Model.cpp
@@ -6,7 +6,6 @@
 #include <Nazara/Graphics/AbstractRenderQueue.hpp>
 #include <Nazara/Graphics/Camera.hpp>
 #include <Nazara/Graphics/Config.hpp>
-#include <Nazara/Renderer/UberShaderLibrary.hpp>
 #include <Nazara/Utility/SkeletalMesh.hpp>
 #include <Nazara/Utility/StaticMesh.hpp>
 #include <memory>
@@ -25,9 +24,6 @@ bool NzModelParameters::IsValid() const
 	if (loadMaterials && !material.IsValid())
 		return false;
 
-	if (!NzUberShaderLibrary::Has(shaderName))
-		return false;
-
 	return mesh.IsValid();
 }