Merge remote-tracking branch 'upstream/master'

2 files changed, 2 insertions, 1 deletions

diff --git a/bin/tests/test_physics.cpp b/bin/tests/test_physics.cpp
index 3dd8c5744d..ba305cc769 100644
--- a/bin/tests/test_physics.cpp
+++ b/bin/tests/test_physics.cpp
@@ -90,7 +90,7 @@ protected:
 		PhysicsServer * ps = PhysicsServer::get_singleton();
 
 		RID mesh_instance = vs->instance_create2(type_mesh_map[p_shape],scenario);
-		RID body = ps->body_create(p_body,!p_active_default);
+		RID body = ps->body_create(p_body,!p_active_default);		
 		ps->body_set_space(body,space);
 		ps->body_set_param(body,PhysicsServer::BODY_PARAM_BOUNCE,0.5);
 		//todo set space
diff --git a/bin/tests/test_physics_2d.cpp b/bin/tests/test_physics_2d.cpp
index db7f6ea374..b2ad1d9ee8 100644
--- a/bin/tests/test_physics_2d.cpp
+++ b/bin/tests/test_physics_2d.cpp
@@ -270,6 +270,7 @@ protected:
 		RID body = ps->body_create();
 		ps->body_add_shape(body,body_shape_data[p_shape].shape);
 		ps->body_set_space(body,space);
+		ps->body_set_continuous_collision_detection_mode(body,Physics2DServer::CCD_MODE_CAST_SHAPE);
 		ps->body_set_state(body,Physics2DServer::BODY_STATE_TRANSFORM,p_xform);
 
 //		print_line("add body with xform: "+p_xform);