asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fix owner when importing meshes
This commit is contained in:
Rémi Verschelde 2024-02-27 21:23:00 +01:00
commit 3dca3c22fc
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scene/main/node.cpp
View file

@ -2958,17 +2958,24 @@ void Node::replace_by(Node *p_node, bool p_keep_groups) {
remove_child(child); remove_child(child);
if (!child->is_owned_by_parent()) { if (!child->is_owned_by_parent()) {
// add the custom children to the p_node // 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); p_node->add_child(child);
child->set_owner(child_owner);
} }
} }
p_node->set_owner(owner); p_node->set_owner(owner);
for (Node *E : owned) { 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) { 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()); p_node->set_scene_file_path(get_scene_file_path());