From 30380d2979537acf5f24000f08e9aaf967038df9 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: 740af3fb62dff7b07f184e8d13d00937b5e36f7d [formerly aedb01d9208c9e6579cae5d03e5a0c90424383f7] [formerly eb67802a9d6a3d67590f5c61e4b75c518da792ef [formerly d83b7c4c0241d43fa7d85741f67866303c1e86b6]]
Former-commit-id: c89e8612ad25f22a4bc471e916221c7338765b4d [formerly 1a72ceeeb9fa47b40fabfa2c6b98231e918bd18d]
Former-commit-id: 105238d08f0f41832751e0768324066c853b84b8
---
 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;