Merge remote-tracking branch 'origin/master' into Particle-Update

Former-commit-id: 7ec9fba80c2b47a1fb811c7912df67262986c9f0
2014-08-25 23:09:36 +02:00
parent f3baf9f9df 98aa804de5
commit 54382afc37
12 changed files with 44 additions and 49 deletions
--- a/include/Nazara/Graphics/Material.hpp
+++ b/include/Nazara/Graphics/Material.hpp
@@ -135,7 +135,7 @@ class NAZARA_API NzMaterial : public NzResource
 		struct ShaderInstance
 		{
 			const NzShader* shader;
-			NzUberShaderInstance* uberInstance;
+			NzUberShaderInstance* uberInstance = nullptr;
 			int uniforms[nzMaterialUniform_Max+1];
 		};