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

Former-commit-id: ae0244334123a3442c7675df80b1a501a6837257
2014-12-17 14:00:20 +01:00
parent 7316cbb694 e55c521e96
commit 528969d0fa
28 changed files with 652 additions and 64 deletions
--- a/src/Nazara/Renderer/RenderWindow.cpp
+++ b/src/Nazara/Renderer/RenderWindow.cpp
@@ -320,4 +320,3 @@ void NzRenderWindow::OnWindowResized()
 {
 	NotifySizeChange();
 }
-
--- a/src/Nazara/Renderer/Renderer.cpp
+++ b/src/Nazara/Renderer/Renderer.cpp
@@ -1856,7 +1856,7 @@ bool NzRenderer::EnsureStateUpdate()

 								default:
 								{
-									NazaraInternalError("Unsupported component type");
+									NazaraInternalError("Unsupported component type (0x" + NzString::Number(type, 16) + ')');
 									break;
 								}
 							}