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/src/Nazara/Graphics/ForwardRenderTechnique.cpp
+++ b/src/Nazara/Graphics/ForwardRenderTechnique.cpp
@@ -10,14 +10,12 @@
 #include <Nazara/Graphics/Drawable.hpp>
 #include <Nazara/Graphics/Light.hpp>
 #include <Nazara/Graphics/Material.hpp>
-#include <Nazara/Graphics/Sprite.hpp>
+#include <Nazara/Graphics/SceneData.hpp>
 #include <Nazara/Renderer/Config.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
 #include <Nazara/Utility/BufferMapper.hpp>
-#include <Nazara/Utility/StaticMesh.hpp>
 #include <Nazara/Utility/VertexStruct.hpp>
 #include <limits>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz