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/SkeletalModel.hpp
+++ b/include/Nazara/Graphics/SkeletalModel.hpp
@@ -12,9 +12,7 @@
 #include <Nazara/Core/Updatable.hpp>
 #include <Nazara/Graphics/Model.hpp>
 #include <Nazara/Utility/Animation.hpp>
-#include <Nazara/Utility/Buffer.hpp>
-#include <Nazara/Utility/VertexBuffer.hpp>
-#include <vector>
+#include <Nazara/Utility/Skeleton.hpp>

 namespace Nz
 {