diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-01 11:00:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-01 11:00:59 +0100 |
| commit | 97e5367fe8f62eb2481bf7e43b4ffb4bd56dc028 (patch) | |
| tree | c9002e1db3fc88e395e7034498b309ba110300a8 | |
| parent | 73f92a6e4d9d29e479d57583a6317081499f5cb4 (diff) | |
| parent | cb5bc58e81ad42def9ae9ab5075d6b754f3d9e96 (diff) | |
Merge pull request #58641 from rburing/joints_fix_signals
| -rw-r--r-- | scene/2d/joint_2d.cpp | 11 | ||||
| -rw-r--r-- | scene/3d/joint_3d.cpp | 11 |
2 files changed, 17 insertions, 5 deletions
diff --git a/scene/2d/joint_2d.cpp b/scene/2d/joint_2d.cpp index 521efe6567..c2773191ea 100644 --- a/scene/2d/joint_2d.cpp +++ b/scene/2d/joint_2d.cpp @@ -159,15 +159,18 @@ NodePath Joint2D::get_node_b() const { void Joint2D::_notification(int p_what) { switch (p_what) { - case NOTIFICATION_READY: { + case NOTIFICATION_POST_ENTER_TREE: { + if (is_configured()) { + _disconnect_signals(); + } _update_joint(); } break; case NOTIFICATION_EXIT_TREE: { if (is_configured()) { _disconnect_signals(); - _update_joint(true); } + _update_joint(true); } break; } } @@ -187,7 +190,9 @@ void Joint2D::set_exclude_nodes_from_collision(bool p_enable) { if (exclude_from_collision == p_enable) { return; } - + if (is_configured()) { + _disconnect_signals(); + } _update_joint(true); exclude_from_collision = p_enable; _update_joint(); diff --git a/scene/3d/joint_3d.cpp b/scene/3d/joint_3d.cpp index f957b6c732..ce7c0d8292 100644 --- a/scene/3d/joint_3d.cpp +++ b/scene/3d/joint_3d.cpp @@ -166,15 +166,18 @@ int Joint3D::get_solver_priority() const { void Joint3D::_notification(int p_what) { switch (p_what) { - case NOTIFICATION_READY: { + case NOTIFICATION_POST_ENTER_TREE: { + if (is_configured()) { + _disconnect_signals(); + } _update_joint(); } break; case NOTIFICATION_EXIT_TREE: { if (is_configured()) { _disconnect_signals(); - _update_joint(true); } + _update_joint(true); } break; } } @@ -183,6 +186,10 @@ void Joint3D::set_exclude_nodes_from_collision(bool p_enable) { if (exclude_from_collision == p_enable) { return; } + if (is_configured()) { + _disconnect_signals(); + } + _update_joint(true); exclude_from_collision = p_enable; _update_joint(); } |