Merge pull request #58650 from lawnjelly/portals_fix_prefix_duplication

Portals - fix duplication of instanced scenes during conversion
godotengine · Mar 1, 2022 · 195b737 · 195b737
2 parents 29d78f2 + 4ec4b5a
commit 195b737
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/scene/3d/room_manager.cpp b/scene/3d/room_manager.cpp
@@ -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);
 	}