From cb5bc58e81ad42def9ae9ab5075d6b754f3d9e96 Mon Sep 17 00:00:00 2001 From: Ricardo Buring Date: Mon, 28 Feb 2022 22:25:45 +0100 Subject: Joint2D and Joint3D: make set_exclude_nodes_from_collision respect signals --- scene/2d/joint_2d.cpp | 3 +++ scene/3d/joint_3d.cpp | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/scene/2d/joint_2d.cpp b/scene/2d/joint_2d.cpp index 623e643333..c2773191ea 100644 --- a/scene/2d/joint_2d.cpp +++ b/scene/2d/joint_2d.cpp @@ -190,6 +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 9a4cf79a8d..ce7c0d8292 100644 --- a/scene/3d/joint_3d.cpp +++ b/scene/3d/joint_3d.cpp @@ -186,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(); } -- cgit v1.2.3