From ada1f66fc1ad26993ceedac13a63f29b3b43a7d4 Mon Sep 17 00:00:00 2001 From: Saracen Date: Fri, 27 Oct 2023 02:08:56 +0100 Subject: [PATCH] Add read-only info to resource embedded in other scenes. --- editor/editor_node.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 8c3637663d4..e36cc7737ee 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -2342,21 +2342,15 @@ void EditorNode::_edit_current(bool p_skip_foreign) { int subr_idx = current_res->get_path().find("::"); if (subr_idx != -1) { String base_path = current_res->get_path().substr(0, subr_idx); - if (!base_path.is_resource_file()) { - if (FileAccess::exists(base_path + ".import")) { + if (FileAccess::exists(base_path + ".import")) { + if (!base_path.is_resource_file()) { if (get_edited_scene() && get_edited_scene()->get_scene_file_path() == base_path) { info_is_warning = true; } - editable_info = TTR("This resource belongs to a scene that was imported, so it's not editable.\nPlease read the documentation relevant to importing scenes to better understand this workflow."); - } else { - if ((!get_edited_scene() || get_edited_scene()->get_scene_file_path() != base_path) && ResourceLoader::get_resource_type(base_path) == "PackedScene") { - editable_info = TTR("This resource belongs to a scene that was instantiated or inherited.\nChanges to it must be made inside the original scene."); - } - } - } else { - if (FileAccess::exists(base_path + ".import")) { - editable_info = TTR("This resource belongs to a scene that was imported, so it's not editable.\nPlease read the documentation relevant to importing scenes to better understand this workflow."); } + editable_info = TTR("This resource belongs to a scene that was imported, so it's not editable.\nPlease read the documentation relevant to importing scenes to better understand this workflow."); + } else if ((!get_edited_scene() || get_edited_scene()->get_scene_file_path() != base_path) && ResourceLoader::get_resource_type(base_path) == "PackedScene") { + editable_info = TTR("This resource belongs to a scene that was instantiated or inherited.\nChanges to it must be made inside the original scene."); } } else if (current_res->get_path().is_resource_file()) { if (FileAccess::exists(current_res->get_path() + ".import")) {