Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine

Former-commit-id: bdbe1aab7fe7f0241069aa2d9ab444897ba471cd [formerly 5fd04e51e2a7441252ef56f136bd9d81df380f75] Former-commit-id: d326241827c4021980631a210603c4d5b77cf6f3
2016-06-01 08:42:58 +02:00
parent 0be81cfa5f d5b354c379
commit 4ab05c2803
14 changed files with 114 additions and 44 deletions
--- a/include/Nazara/Graphics/DepthRenderTechnique.hpp
+++ b/include/Nazara/Graphics/DepthRenderTechnique.hpp
@@ -74,6 +74,6 @@ namespace Nz
 }


-#include <Nazara/Graphics/dEPTHRenderTechnique.inl>
+#include <Nazara/Graphics/DepthRenderTechnique.inl>

 #endif // NAZARA_DEPTHRENDERTECHNIQUE_HPP
--- a/include/Nazara/Physics/Geom.hpp
+++ b/include/Nazara/Physics/Geom.hpp
@@ -20,7 +20,7 @@
 #include <Nazara/Physics/Enums.hpp>
 #include <unordered_map>

-struct NewtonCollision;
+class NewtonCollision;

 namespace Nz
 {
--- a/include/Nazara/Physics/PhysObject.hpp
+++ b/include/Nazara/Physics/PhysObject.hpp
@@ -15,7 +15,7 @@
 #include <Nazara/Physics/Config.hpp>
 #include <Nazara/Physics/Geom.hpp>

-struct NewtonBody;
+class NewtonBody;

 namespace Nz
 {
--- a/include/Nazara/Physics/PhysWorld.hpp
+++ b/include/Nazara/Physics/PhysWorld.hpp
@@ -12,7 +12,7 @@
 #include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Physics/Config.hpp>

-struct NewtonWorld;
+class NewtonWorld;

 namespace Nz
 {