diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-05-18 17:36:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-18 17:36:24 +0200 |
| commit | 03f240ba9309d0d8640eb061080bec92a23614c0 (patch) | |
| tree | 417de18e71e934ecbf10fbb95b78fcf2df07714a /servers/physics_2d | |
| parent | 3b09e90ae77dfe8b6ba5ea00cfc409f3c69fa2cc (diff) | |
| parent | f072aa69a99a436b711afeb4b2b1c10b93883606 (diff) | |
Merge pull request #60599 from rburing/rest_on_recovery_param
Diffstat (limited to 'servers/physics_2d')
| -rw-r--r-- | servers/physics_2d/godot_space_2d.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics_2d/godot_space_2d.cpp b/servers/physics_2d/godot_space_2d.cpp index 731eab2dfe..0a7859d86a 100644 --- a/servers/physics_2d/godot_space_2d.cpp +++ b/servers/physics_2d/godot_space_2d.cpp @@ -874,7 +874,7 @@ bool GodotSpace2D::test_body_motion(GodotBody2D *p_body, const PhysicsServer2D:: bool collided = false; - if (recovered || (safe < 1)) { + if ((p_parameters.recovery_as_collision && recovered) || (safe < 1)) { if (safe >= 1) { best_shape = -1; //no best shape with cast, reset to -1 } |