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/SkyboxBackground.cpp
+++ b/src/Nazara/Graphics/SkyboxBackground.cpp
@@ -6,10 +6,11 @@
 #include <Nazara/Core/ErrorFlags.hpp>
 #include <Nazara/Graphics/AbstractViewer.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
+#include <Nazara/Renderer/RenderStates.hpp>
+#include <Nazara/Renderer/Shader.hpp>
 #include <Nazara/Utility/IndexBuffer.hpp>
 #include <Nazara/Utility/VertexBuffer.hpp>
 #include <Nazara/Utility/VertexDeclaration.hpp>
-#include <memory>
 #include <Nazara/Graphics/Debug.hpp>

 namespace Nz