diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-05 10:50:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-05 10:50:56 +0200 |
| commit | 6637207c70ddda76ff8a3892d525084e8dd99b2b (patch) | |
| tree | e75d1e45de379885678ef515b0e269d4503d0493 /servers/physics_3d | |
| parent | e4e11e6a57123e548af4dd86f6cf54657e3e0845 (diff) | |
| parent | 4f8d761be632a9d342655aa88a0745465b2177b8 (diff) | |
Merge pull request #53420 from nekomatata/fix-tilemap-moving-platform
Diffstat (limited to 'servers/physics_3d')
| -rw-r--r-- | servers/physics_3d/space_3d_sw.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/servers/physics_3d/space_3d_sw.cpp b/servers/physics_3d/space_3d_sw.cpp index f5f497e167..c88747c017 100644 --- a/servers/physics_3d/space_3d_sw.cpp +++ b/servers/physics_3d/space_3d_sw.cpp @@ -704,6 +704,9 @@ bool Space3DSW::test_body_motion(Body3DSW *p_body, const PhysicsServer3D::Motion if (p_parameters.exclude_bodies.has(col_obj->get_self())) { continue; } + if (p_parameters.exclude_objects.has(col_obj->get_instance_id())) { + continue; + } int shape_idx = intersection_query_subindex_results[i]; @@ -795,6 +798,9 @@ bool Space3DSW::test_body_motion(Body3DSW *p_body, const PhysicsServer3D::Motion if (p_parameters.exclude_bodies.has(col_obj->get_self())) { continue; } + if (p_parameters.exclude_objects.has(col_obj->get_instance_id())) { + continue; + } int shape_idx = intersection_query_subindex_results[i]; @@ -916,6 +922,10 @@ bool Space3DSW::test_body_motion(Body3DSW *p_body, const PhysicsServer3D::Motion if (p_parameters.exclude_bodies.has(col_obj->get_self())) { continue; } + if (p_parameters.exclude_objects.has(col_obj->get_instance_id())) { + continue; + } + int shape_idx = intersection_query_subindex_results[i]; rcd.object = col_obj; |