Joint2D and Joint3D: update joint on NOTIFICATION_POST_ENTER_TREE

This allows reparenting, etc.

1 files changed, 5 insertions, 3 deletions

diff --git a/scene/2d/joint_2d.cpp b/scene/2d/joint_2d.cpp
index 521efe6567..623e643333 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,6 @@ void Joint2D::set_exclude_nodes_from_collision(bool p_enable) {
 	if (exclude_from_collision == p_enable) {
 		return;
 	}
-
 	_update_joint(true);
 	exclude_from_collision = p_enable;
 	_update_joint();