diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-11-01 12:39:50 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-01 12:39:50 -0300 |
| commit | e52b439eaa1a06e7af8b157c10b435481e2c9c88 (patch) | |
| tree | 6ef7bb7076db8f2d34eef8fd76d0e0292fff5e61 | |
| parent | aec8ea4f47af23e6acff181189bbbfaf7f3d18f5 (diff) | |
| parent | 09250850ecff1ede552dd2d201c348c3376f687f (diff) | |
| download | redot-engine-e52b439eaa1a06e7af8b157c10b435481e2c9c88.tar.gz | |
Merge pull request #22933 from SeleckyErik/issue-9148
Fixed non-monitorable areas triggering overlap (reopened)
| -rw-r--r-- | servers/physics_2d/area_pair_2d_sw.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/physics_2d/area_pair_2d_sw.cpp b/servers/physics_2d/area_pair_2d_sw.cpp index 9d515d2183..cdd35cf657 100644 --- a/servers/physics_2d/area_pair_2d_sw.cpp +++ b/servers/physics_2d/area_pair_2d_sw.cpp @@ -147,10 +147,10 @@ Area2Pair2DSW::~Area2Pair2DSW() { if (colliding) { - if (area_b->has_area_monitor_callback() && area_a->is_monitorable()) + if (area_b->has_area_monitor_callback()) area_b->remove_area_from_query(area_a, shape_a, shape_b); - if (area_a->has_area_monitor_callback() && area_b->is_monitorable()) + if (area_a->has_area_monitor_callback()) area_a->remove_area_from_query(area_b, shape_b, shape_a); } |