diff --git a/doc/classes/Node.xml b/doc/classes/Node.xml
index 8fb2e65faf1..5dd3d220623 100644
--- a/doc/classes/Node.xml
+++ b/doc/classes/Node.xml
@@ -739,7 +739,7 @@
- Changes the parent of this [Node] to the [param new_parent]. The node needs to already have a parent.
+ Changes the parent of this [Node] to the [param new_parent]. The node needs to already have a parent. The node's [member owner] is preserved if its owner is still reachable from the new location (i.e., the node is still a descendant of the new parent after the operation).
If [param keep_global_transform] is [code]true[/code], the node's global transform will be preserved if supported. [Node2D], [Node3D] and [Control] support this argument (but [Control] keeps only position).
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 1dd3b8bd1bb..a6b7ca8188b 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -1736,8 +1736,40 @@ void Node::reparent(Node *p_parent, bool p_keep_global_transform) {
return;
}
+ bool preserve_owner = data.owner && (data.owner == p_parent || data.owner->is_ancestor_of(p_parent));
+ Node *owner_temp = data.owner;
+ LocalVector common_parents;
+
+ // If the new parent is related to the owner, find all children of the reparented node who have the same owner so that we can reassign them.
+ if (preserve_owner) {
+ LocalVector to_visit;
+
+ to_visit.push_back(this);
+ common_parents.push_back(this);
+
+ while (to_visit.size() > 0) {
+ Node *check = to_visit[to_visit.size() - 1];
+ to_visit.resize(to_visit.size() - 1);
+
+ for (int i = 0; i < check->get_child_count(); i++) {
+ Node *child = check->get_child(i, false);
+ to_visit.push_back(child);
+ if (child->data.owner == owner_temp) {
+ common_parents.push_back(child);
+ }
+ }
+ }
+ }
+
data.parent->remove_child(this);
p_parent->add_child(this);
+
+ // Reassign the old owner to those found nodes.
+ if (preserve_owner) {
+ for (Node *E : common_parents) {
+ E->set_owner(owner_temp);
+ }
+ }
}
Node *Node::get_parent() const {
@@ -1925,7 +1957,7 @@ void Node::set_owner(Node *p_owner) {
return;
}
- Node *check = this->get_parent();
+ Node *check = get_parent();
bool owner_valid = false;
while (check) {