Merge branch 'master' into reflection-mapping

2016-12-18 01:24:19 +01:00
parent 37d36a89a6 b64aa72626
commit d1a9748c33
1 changed files with 1 additions and 1 deletions
--- a/src/Nazara/Renderer/UberShaderPreprocessor.cpp
+++ b/src/Nazara/Renderer/UberShaderPreprocessor.cpp
@@ -95,7 +95,7 @@ namespace Nz
 							{
 								ErrorFlags errFlags(ErrorFlag_ThrowExceptionDisabled);

-								NazaraError("Shader code failed to compile:\n" + code);
+								NazaraError("Shader code failed to compile (" + stage.GetLog() + ")\n" + code.ToString());
 								throw;
 							}