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/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?)
 	};
 }