Browse Source

Merge pull request #50749 from lawnjelly/portals_fix_adding_twice

Portals - fix adding statics twice
Rémi Verschelde 4 years ago
parent
commit
b0132e59c4
1 changed files with 6 additions and 0 deletions
  1. 6 0
      scene/3d/room_manager.cpp

+ 6 - 0
scene/3d/room_manager.cpp

@@ -1141,6 +1141,12 @@ void RoomManager::_autoplace_recursive(Spatial *p_node) {
 		return;
 	}
 
+	// as soon as we hit a room, quit the recursion as the objects
+	// will already have been added inside rooms
+	if (Object::cast_to<Room>(p_node)) {
+		return;
+	}
+
 	VisualInstance *vi = Object::cast_to<VisualInstance>(p_node);
 
 	// we are only interested in VIs with static or dynamic mode