From f4c50920272bba2ea61c2692652d84c49b7209ed Mon Sep 17 00:00:00 2001 From: lawnjelly Date: Thu, 5 Aug 2021 13:14:00 +0100 Subject: [PATCH] Portals - rooms_set_active needs Editor check Calling rooms_set_active with TOOLS_ENABLED from a running project resulted in a crash because the Spatial Editor is not available. Wrapped it in an is_editor_hint. --- scene/3d/room_manager.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scene/3d/room_manager.cpp b/scene/3d/room_manager.cpp index bd77c97e5c..e305584634 100644 --- a/scene/3d/room_manager.cpp +++ b/scene/3d/room_manager.cpp @@ -510,7 +510,12 @@ void RoomManager::rooms_set_active(bool p_active) { _active = p_active; #ifdef TOOLS_ENABLED - SpatialEditor::get_singleton()->update_portal_tools(); + if (Engine::get_singleton()->is_editor_hint()) { + SpatialEditor *spatial_editor = SpatialEditor::get_singleton(); + if (spatial_editor) { + spatial_editor->update_portal_tools(); + } + } #endif } }