From 61f03daeeb2a295f273586f554a6f9d20f9069e4 Mon Sep 17 00:00:00 2001 From: David Snopek Date: Wed, 3 May 2023 09:47:33 -0500 Subject: [PATCH] Explicitly mark inherited export mode when making a dedicated server export --- editor/export/project_export.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/editor/export/project_export.cpp b/editor/export/project_export.cpp index 114d927c4d5..d9e0f9831b0 100644 --- a/editor/export/project_export.cpp +++ b/editor/export/project_export.cpp @@ -833,14 +833,20 @@ bool ProjectExportDialog::_fill_tree(EditorFileSystemDirectory *p_dir, TreeItem void ProjectExportDialog::_propagate_file_export_mode(TreeItem *p_item, EditorExportPreset::FileExportMode p_inherited_export_mode) { EditorExportPreset::FileExportMode file_export_mode = (EditorExportPreset::FileExportMode)(int)p_item->get_metadata(1); + bool is_inherited = false; if (file_export_mode == EditorExportPreset::MODE_FILE_NOT_CUSTOMIZED) { file_export_mode = p_inherited_export_mode; + is_inherited = true; } if (file_export_mode == EditorExportPreset::MODE_FILE_NOT_CUSTOMIZED) { p_item->set_text(1, ""); } else { - p_item->set_text(1, file_mode_popup->get_item_text(file_mode_popup->get_item_index(file_export_mode))); + String text = file_mode_popup->get_item_text(file_mode_popup->get_item_index(file_export_mode)); + if (is_inherited) { + text += " " + TTR("(Inherited)"); + } + p_item->set_text(1, text); } for (int i = 0; i < p_item->get_child_count(); i++) {