浏览代码

Merge pull request #88497 from Sauermann/fix-owner-import

Fix owner when importing meshes
Rémi Verschelde 1 年之前
父节点
当前提交
3dca3c22fc
共有 1 个文件被更改,包括 9 次插入2 次删除
  1. 9 2
      scene/main/node.cpp

+ 9 - 2
scene/main/node.cpp

@@ -2958,17 +2958,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());