diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-21 11:28:02 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-21 11:28:02 +0100 |
| commit | 7b622ce6e8a40508dbfccb21380e5f0b2dd45fac (patch) | |
| tree | 633abb4f920e5a365b8b781e5d6cbc91734b92f9 /scene/2d/physics_body_2d.cpp | |
| parent | d45af488c47a1ed1812e5b6c5c01beee4890e250 (diff) | |
| parent | 398e73c689e8506933a066c6a8045a50f58d0c04 (diff) | |
| download | redot-engine-7b622ce6e8a40508dbfccb21380e5f0b2dd45fac.tar.gz | |
Merge pull request #71021 from reduz/prevent-physics-callback-removal
Error when removing a physics node during a physics callback
Diffstat (limited to 'scene/2d/physics_body_2d.cpp')
| -rw-r--r-- | scene/2d/physics_body_2d.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index 9fee99c6a7..1721bcde3b 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -434,6 +434,8 @@ struct _RigidBody2DInOut { }; void RigidBody2D::_body_state_changed(PhysicsDirectBodyState2D *p_state) { + lock_callback(); + set_block_transform_notify(true); // don't want notify (would feedback loop) if (!freeze || freeze_mode != FREEZE_MODE_KINEMATIC) { set_global_transform(p_state->get_transform()); @@ -527,6 +529,8 @@ void RigidBody2D::_body_state_changed(PhysicsDirectBodyState2D *p_state) { contact_monitor->locked = false; } + + unlock_callback(); } void RigidBody2D::_apply_body_mode() { |