From 224bafcbceae54438b1ade452322fe9d6f089826 Mon Sep 17 00:00:00 2001 From: Adam Johnston Date: Tue, 26 Nov 2024 20:34:15 -0800 Subject: [PATCH] Compare localized path against editor scene path when reloading and loading --- editor/editor_node.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 4ab5e55742b..f72eed0f95e 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -3960,7 +3960,7 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b return OK; } - String lpath = ResourceUID::ensure_path(p_scene); + String lpath = ProjectSettings::get_singleton()->localize_path(ResourceUID::ensure_path(p_scene)); if (!p_set_inherited) { for (int i = 0; i < editor_data.get_edited_scene_count(); i++) { if (editor_data.get_scene_path(i) == lpath) { @@ -3978,7 +3978,6 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b } } - lpath = ProjectSettings::get_singleton()->localize_path(lpath); if (!lpath.begins_with("res://")) { show_accept(TTR("Error loading scene, it must be inside the project path. Use 'Import' to open the scene, then save it inside the project path."), TTR("OK")); opening_prev = false; @@ -5925,8 +5924,11 @@ void EditorNode::_notify_nodes_scene_reimported(Node *p_node, Array p_reimported void EditorNode::reload_scene(const String &p_path) { int scene_idx = -1; + + String lpath = ProjectSettings::get_singleton()->localize_path(p_path); + for (int i = 0; i < editor_data.get_edited_scene_count(); i++) { - if (editor_data.get_scene_path(i) == p_path) { + if (editor_data.get_scene_path(i) == lpath) { scene_idx = i; break; }