From 9e9abe2137bd5b2e621aab4154701d0055e5e7e3 Mon Sep 17 00:00:00 2001
From: lawnjelly <lawnjelly@gmail.com>
Date: Mon, 2 Aug 2021 16:01:59 +0100
Subject: [PATCH] Portals - Fix UI default

I had forgotten to add a call to update_portal_tools() at the end of the SpatialEditor constructors. This ensures that the portal UI is off by default in normal use without portals.
---
 editor/plugins/spatial_editor_plugin.cpp | 43 ++++++++++++++----------
 editor/plugins/spatial_editor_plugin.h   |  2 +-
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp
index f0b46fd84c6..c285d2ca01b 100644
--- a/editor/plugins/spatial_editor_plugin.cpp
+++ b/editor/plugins/spatial_editor_plugin.cpp
@@ -4319,28 +4319,31 @@ void SpatialEditor::show_advanced_portal_tools(bool p_show) {
 }
 
 void SpatialEditor::update_portal_tools() {
-	// the view portal culling toggle
-	int view_portal_item_index = view_menu->get_popup()->get_item_index(MENU_VIEW_PORTAL_CULLING);
-	if (RoomManager::active_room_manager) {
-		view_menu->get_popup()->set_item_disabled(view_portal_item_index, false);
+	// just some protection against calling null pointers, hopefully not needed
+	if (view_menu && view_menu->get_popup()) {
+		// the view portal culling toggle
+		int view_portal_item_index = view_menu->get_popup()->get_item_index(MENU_VIEW_PORTAL_CULLING);
+		if (RoomManager::active_room_manager) {
+			view_menu->get_popup()->set_item_disabled(view_portal_item_index, false);
 
-		bool active = RoomManager::static_rooms_get_active();
-		view_menu->get_popup()->set_item_checked(view_portal_item_index, active);
-	} else {
-		view_menu->get_popup()->set_item_disabled(view_portal_item_index, true);
-	}
+			bool active = RoomManager::static_rooms_get_active();
+			view_menu->get_popup()->set_item_checked(view_portal_item_index, active);
+		} else {
+			view_menu->get_popup()->set_item_disabled(view_portal_item_index, true);
+		}
 
-	// toolbar button
-	Button *const button = tool_button[TOOL_CONVERT_ROOMS];
+		// toolbar button
+		Button *const button = tool_button[TOOL_CONVERT_ROOMS];
 
-	if (RoomManager::active_room_manager) {
-		button->show();
-	} else {
-		button->hide();
-	}
+		if (RoomManager::active_room_manager) {
+			button->show();
+		} else {
+			button->hide();
+		}
 
-	for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) {
-		viewports[i]->_update_name();
+		for (uint32_t i = 0; i < VIEWPORTS_COUNT; i++) {
+			viewports[i]->_update_name();
+		}
 	}
 }
 
@@ -6593,6 +6596,10 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) {
 	EDITOR_DEF("editors/3d/navigation/show_viewport_rotation_gizmo", true);
 
 	over_gizmo_handle = -1;
+
+	// make sure the portal tools are off by default
+	// (when no RoomManager is present)
+	update_portal_tools();
 }
 
 SpatialEditor::~SpatialEditor() {
diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h
index 5030cb4eb3c..f0dcf689366 100644
--- a/editor/plugins/spatial_editor_plugin.h
+++ b/editor/plugins/spatial_editor_plugin.h
@@ -652,7 +652,7 @@ private:
 
 	MenuButton *transform_menu;
 	PopupMenu *gizmos_menu;
-	MenuButton *view_menu;
+	MenuButton *view_menu = nullptr;
 
 	AcceptDialog *accept;