diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-30 10:08:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-30 10:08:52 +0200 |
| commit | 24c6ee9f560bcfa5f234a423df624f50922f929f (patch) | |
| tree | 192cbcc2de94ad62333ecff3531cfbfe89bf183c /servers/physics_3d/body_pair_3d_sw.cpp | |
| parent | cb2fb98af3cd1a62e050696d5b080992c9dbaf16 (diff) | |
| parent | a65cdca8947c51f4a68032b76e0b970e7fcf1d93 (diff) | |
Merge pull request #49844 from nekomatata/physics-disabled-shapes
Fix and clean disabled shapes handling in godot physics servers
Diffstat (limited to 'servers/physics_3d/body_pair_3d_sw.cpp')
| -rw-r--r-- | servers/physics_3d/body_pair_3d_sw.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/servers/physics_3d/body_pair_3d_sw.cpp b/servers/physics_3d/body_pair_3d_sw.cpp index aed4815c5e..6fc0fa8690 100644 --- a/servers/physics_3d/body_pair_3d_sw.cpp +++ b/servers/physics_3d/body_pair_3d_sw.cpp @@ -230,11 +230,6 @@ bool BodyPair3DSW::setup(real_t p_step) { } } - if (A->is_shape_set_as_disabled(shape_A) || B->is_shape_set_as_disabled(shape_B)) { - collided = false; - return false; - } - offset_B = B->get_transform().get_origin() - A->get_transform().get_origin(); validate_contacts(); @@ -607,11 +602,6 @@ bool BodySoftBodyPair3DSW::setup(real_t p_step) { return false; } - if (body->is_shape_set_as_disabled(body_shape)) { - collided = false; - return false; - } - const Transform3D &xform_Au = body->get_transform(); Transform3D xform_A = xform_Au * body->get_shape_transform(body_shape); |