Merge branch 'master' into reflection-mapping

This commit is contained in:
Lynix
2017-10-02 21:11:15 +02:00
518 changed files with 6740 additions and 2355 deletions

View File

@@ -2,9 +2,8 @@
// This file is part of the "Nazara Engine - Graphics module"
// For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Graphics/MaterialPipeline.hpp>
#include <Nazara/Core/Algorithm.hpp>
#include <Nazara/Renderer/Renderer.hpp>
#include <Nazara/Renderer/UberShaderInstance.hpp>
#include <functional>
#include <Nazara/Graphics/Debug.hpp>