Merge remote-tracking branch 'refs/remotes/origin/master' into enet_wip_nothing_to_see_here

2017-03-09 18:20:30 +01:00
parent a4fe005e3b cdf7c11ef8
commit 2cf1d5ddfc
4 changed files with 11 additions and 12 deletions
--- a/include/Nazara/Physics2D/PhysWorld2D.hpp
+++ b/include/Nazara/Physics2D/PhysWorld2D.hpp
@@ -91,7 +91,7 @@ namespace Nz
 		private:
 			void InitCallbacks(cpCollisionHandler* handler, const Callback& callbacks);

-			using PostStep = std::function<void()>;
+			using PostStep = std::function<void(Nz::RigidBody2D* body)>;

 			void OnRigidBodyMoved(RigidBody2D* oldPointer, RigidBody2D* newPointer);
 			void OnRigidBodyRelease(RigidBody2D* rigidBody);