From b2f8fc2701e1a6ce8c8e37bb096597c1636496f6 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Sun, 14 Aug 2016 17:58:38 +0200
Subject: [PATCH] Graphics/MaterialPipeline: Fix default pipeline not having an
 ubershader

Former-commit-id: db0ee5afb38004d856fcec24b17eb1a5e588b1eb [formerly daed416404ab75182de5b90b2963b7cf291d404c] [formerly e0662145c3acac11590b804dd95754fa9fa2e284 [formerly e373d5aed8818a7bd7b574915f96bedb81e62643]]
Former-commit-id: a3c3ea331053d1e697ec76f1adda0ff5797cb66e [formerly 0034ddafa68e6810fdb2e64daf79c7e4a127f5a4]
Former-commit-id: a5027780263c62009f4a34df8110b50960465059
---
 src/Nazara/Graphics/MaterialPipeline.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Nazara/Graphics/MaterialPipeline.cpp b/src/Nazara/Graphics/MaterialPipeline.cpp
index 4cbd56274..c3d35504f 100644
--- a/src/Nazara/Graphics/MaterialPipeline.cpp
+++ b/src/Nazara/Graphics/MaterialPipeline.cpp
@@ -58,6 +58,8 @@ namespace Nz
 
 	void MaterialPipeline::GenerateRenderPipeline(UInt32 flags) const
 	{
+		NazaraAssert(m_pipelineInfo.uberShader, "Material pipeline has no uber shader");
+
 		ParameterList list;
 		list.SetParameter("ALPHA_MAPPING",     m_pipelineInfo.hasAlphaMap);
 		list.SetParameter("ALPHA_TEST",        m_pipelineInfo.alphaTest);
@@ -136,6 +138,7 @@ namespace Nz
 
 		// Once the base shaders are registered, we can now set some default materials
 		MaterialPipelineInfo pipelineInfo;
+		pipelineInfo.uberShader = UberShaderLibrary::Get("Basic");
 
 		// Basic 2D - No depth write/face culling
 		pipelineInfo.depthWrite = false;