From 17e50c629cd315875190a745029a591624f40fae Mon Sep 17 00:00:00 2001
From: Markus Sauermann <6299227+Sauermann@users.noreply.github.com>
Date: Mon, 26 Feb 2024 22:24:57 +0100
Subject: [PATCH] Fix owner when importing meshes

Handle the case correctly, that a child of a replaced node has
as owner an ancestor of the replaced node.

(cherry picked from commit c58607c32fc45abae1ef8885d05954a717b5eeec)
---
 scene/main/node.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index fb915401a67..74dce01d9a0 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -2829,17 +2829,24 @@ void Node::replace_by(Node *p_node, bool p_keep_groups) {
 		remove_child(child);
 		if (!child->is_owned_by_parent()) {
 			// add the custom children to the p_node
+			Node *child_owner = child->get_owner() == this ? p_node : child->get_owner();
+			child->set_owner(nullptr);
 			p_node->add_child(child);
+			child->set_owner(child_owner);
 		}
 	}
 
 	p_node->set_owner(owner);
 	for (Node *E : owned) {
-		E->set_owner(p_node);
+		if (E->data.owner != p_node) {
+			E->set_owner(p_node);
+		}
 	}
 
 	for (Node *E : owned_by_owner) {
-		E->set_owner(owner);
+		if (E->data.owner != owner) {
+			E->set_owner(owner);
+		}
 	}
 
 	p_node->set_scene_file_path(get_scene_file_path());