Merge branch 'master' into reflection-mapping

2017-10-02 21:11:15 +02:00
parent 9efcfb54ac 99d21b8722
commit c763dea4e1
518 changed files with 6740 additions and 2355 deletions
--- a/include/Nazara/Graphics/TextSprite.hpp
+++ b/include/Nazara/Graphics/TextSprite.hpp
@@ -11,13 +11,11 @@
 #include <Nazara/Graphics/Material.hpp>
 #include <Nazara/Graphics/InstancedRenderable.hpp>
 #include <Nazara/Utility/AbstractAtlas.hpp>
-#include <Nazara/Utility/AbstractTextDrawer.hpp>
 #include <Nazara/Utility/VertexStruct.hpp>
-#include <memory>
-#include <set>

 namespace Nz
 {
+	class AbstractTextDrawer;
 	class TextSprite;

 	using TextSpriteConstRef = ObjectRef<const TextSprite>;