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

2016-10-19 11:17:12 +02:00
parent 4ba744c1bc f3e1b19326
commit 725dc6cdbc
151 changed files with 3726 additions and 1373 deletions
--- a/include/Nazara/Graphics/TextSprite.hpp
+++ b/include/Nazara/Graphics/TextSprite.hpp
@@ -78,7 +78,6 @@ namespace Nz
 			Color m_color;
 			MaterialRef m_material;
 			Recti m_localBounds;
-			mutable bool m_verticesUpdated;
 			float m_scale;

 			static TextSpriteLibrary::LibraryMap s_library;