godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Display scene file extensions in the editor only if there's ambiguity

Browse Source 
This also simplifies the Editor Settings as the extension is now
automatically shown to avoid ambiguity.

(cherry picked from commit 218d124755)
This commit is contained in:
Hugo Locurcio
2020-01-19 18:48:59 +01:00
committed by Rémi Verschelde
parent 645842e0e8
commit 4881d96ef0
4 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
editor/rename_dialog.cpp
View File

@@ -449,7 +449,10 @@ String RenameDialog::_substitute(const String &subject, const Node *node, int co
}
int current = EditorNode::get_singleton()->get_editor_data().get_edited_scene();
result = result.replace("${SCENE}", EditorNode::get_singleton()->get_editor_data().get_scene_title(current));
// Always request the scene title with the extension stripped.
// Otherwise, the result could vary depending on whether a scene with the same name
// (but different extension) is currently open.
result = result.replace("${SCENE}", EditorNode::get_singleton()->get_editor_data().get_scene_title(current, true));
Node *root_node = SceneTree::get_singleton()->get_edited_scene_root();
if (root_node) {