From 634b67be56a67ce5d0d06f46da09713e165957e4 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Thu, 13 Oct 2016 08:33:15 +0200
Subject: [PATCH] Fix merge fail

---
 SDK/include/NDK/Systems/PhysicsSystem3D.hpp | 2 +-
 SDK/src/NDK/Systems/PhysicsSystem3D.cpp     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SDK/include/NDK/Systems/PhysicsSystem3D.hpp b/SDK/include/NDK/Systems/PhysicsSystem3D.hpp
index f1164fd0d..35194b7c8 100644
--- a/SDK/include/NDK/Systems/PhysicsSystem3D.hpp
+++ b/SDK/include/NDK/Systems/PhysicsSystem3D.hpp
@@ -33,7 +33,7 @@ namespace Ndk
 
 			EntityList m_dynamicObjects;
 			EntityList m_staticObjects;
-			std::unique_ptr<Nz::PhysWorld3D> m_world; ///TODO: std::optional (Should I make a Nz::Optional class?)
+			mutable std::unique_ptr<Nz::PhysWorld3D> m_world; ///TODO: std::optional (Should I make a Nz::Optional class?)
 	};
 }
 
diff --git a/SDK/src/NDK/Systems/PhysicsSystem3D.cpp b/SDK/src/NDK/Systems/PhysicsSystem3D.cpp
index f92e8a92a..fd5e05d66 100644
--- a/SDK/src/NDK/Systems/PhysicsSystem3D.cpp
+++ b/SDK/src/NDK/Systems/PhysicsSystem3D.cpp
@@ -41,11 +41,11 @@ namespace Ndk
 	{
 	}
 
-	void PhysicsSystem::CreatePhysWorld() const
+	void PhysicsSystem3D::CreatePhysWorld() const
 	{
 		NazaraAssert(!m_world, "Physics world should not be created twice");
 
-		m_world = std::make_unique<Nz::PhysWorld>();
+		m_world = std::make_unique<Nz::PhysWorld3D>();
 	}
 
 	/*!