godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52338 from lawnjelly/portals_fix_portal_import

Browse Source 
Portals - fix import of portal normal + small bug fixes
This commit is contained in:
Rémi Verschelde
2021-09-14 10:21:44 +02:00
committed by GitHub
parent 37fab65e00 116e2ce799
commit f85ad007c0
3 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scene/3d/room_manager.cpp
View File

@@ -873,7 +873,14 @@ void RoomManager::_second_pass_portals(Spatial *p_roomlist, LocalVector<Portal *
String string_link_room = string_link_room_shortname + "-room";
if (string_link_room_shortname != "") {
// try the room name plus the postfix first, this will be the most common case during import
Room *linked_room = Object::cast_to<Room>(p_roomlist->find_node(string_link_room, true, false));
// try the short name as a last ditch attempt
if (!linked_room) {
linked_room = Object::cast_to<Room>(p_roomlist->find_node(string_link_room_shortname, true, false));
}
if (linked_room) {
NodePath path = portal->get_path_to(linked_room);
portal->set_linked_room_internal(path);