Merge remote-tracking branch 'refs/remotes/origin/master' into reflection-mapping

2017-01-06 17:29:54 +01:00
parent adf5cd32b8 645e4aed17
commit d2ee4744a9
3 changed files with 3 additions and 3 deletions
--- a/src/Nazara/Graphics/MaterialPipeline.cpp
+++ b/src/Nazara/Graphics/MaterialPipeline.cpp
@@ -31,6 +31,8 @@ namespace Nz

 		void OverrideShader(const String& path, String* source)
 		{
+			ErrorFlags errFlags(ErrorFlag_Silent | ErrorFlag_ThrowExceptionDisabled);
+
 			File shaderFile(path, Nz::OpenMode_ReadOnly | Nz::OpenMode_Text);
 			if (shaderFile.IsOpen())
 			{