Merge branch 'master' into nazara-next

2020-09-17 20:28:11 +02:00
parent 3f6f18859c 980d200092
commit 790815e9ee
270 changed files with 106800 additions and 334 deletions
--- a/src/Nazara/Physics2D/RigidBody2D.cpp
+++ b/src/Nazara/Physics2D/RigidBody2D.cpp
@@ -695,6 +695,8 @@ namespace Nz
 		cpBodySetVelocity(to, cpBodyGetVelocity(from));

 		cpBodySetType(to, cpBodyGetType(from));
+
+		to->velocity_func = from->velocity_func;
 	}

 	void RigidBody2D::CopyShapeData(cpShape* from, cpShape* to)