Skip to content

Commit

Permalink
Portals - fix duplication of instanced scenes during conversion
Browse files Browse the repository at this point in the history
During room conversion, if a prefixed Spatial is converted to a Room / RoomGroup etc, when using instanced scenes the owner was incorrectly set, resulting in the instanced scene objects being duplicated.

This PR corrects this.
  • Loading branch information
lawnjelly committed Mar 1, 2022
1 parent 706d282 commit 4ec4b5a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion scene/3d/room_manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2073,9 +2073,10 @@ void RoomManager::_flip_portals_recursive(Spatial *p_node) {
}

void RoomManager::_set_owner_recursive(Node *p_node, Node *p_owner) {
if (p_node != p_owner) {
if (!p_node->get_owner() && (p_node != p_owner)) {
p_node->set_owner(p_owner);
}

for (int n = 0; n < p_node->get_child_count(); n++) {
_set_owner_recursive(p_node->get_child(n), p_owner);
}
Expand Down

0 comments on commit 4ec4b5a

Please sign in to comment.