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/MaterialPipeline.hpp
+++ b/include/Nazara/Graphics/MaterialPipeline.hpp
@@ -10,10 +10,8 @@
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Graphics/Config.hpp>
 #include <Nazara/Graphics/Enums.hpp>
-#include <Nazara/Renderer/Enums.hpp>
 #include <Nazara/Renderer/RenderPipeline.hpp>
 #include <Nazara/Renderer/UberShader.hpp>
-#include <Nazara/Utility/Enums.hpp>
 #include <array>

 namespace Nz