Fix merge fail

2016-10-13 08:33:15 +02:00
parent 1fdda6b07c
commit 634b67be56
2 changed files with 3 additions and 3 deletions
--- 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>();
 	}

 	/*!