godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the editor action "Revert Scene" to "Reload Saved Scene" 

This option can be used to workaround various issues with stuff
not reloading properly when changes are made.
The option was renamed to clarify the fact that it actually
reloads the scene saved on the filesystem.

(cherry picked from commit 2962819d1c)
This commit is contained in:
Hugo Locurcio 2020-05-10 20:12:25 +02:00 committed by Rémi Verschelde
parent 72aa9ce7fc
commit 0b6bcf90f5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/editor_node.cpp
View File

@ -2352,7 +2352,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
} }
} break; } break;
case EDIT_REVERT: { case EDIT_RELOAD_SAVED_SCENE: {
Node *scene = get_edited_scene(); Node *scene = get_edited_scene();
@ -2367,8 +2367,9 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
} }
if (unsaved_cache && !p_confirmed) { if (unsaved_cache && !p_confirmed) {
confirmation->get_ok()->set_text(TTR("Revert")); confirmation->get_ok()->set_text(TTR("Reload Saved Scene"));
confirmation->set_text(TTR("This action cannot be undone. Revert anyway?")); confirmation->set_text(
TTR("The current scene has unsaved changes.\nReload the saved scene anyway? This action cannot be undone."));
confirmation->popup_centered_minsize(); confirmation->popup_centered_minsize();
break; break;
} }
@ -6147,7 +6148,7 @@ EditorNode::EditorNode() {
p->add_shortcut(ED_SHORTCUT("editor/redo", TTR("Redo"), KEY_MASK_SHIFT + KEY_MASK_CMD + KEY_Z), EDIT_REDO, true); p->add_shortcut(ED_SHORTCUT("editor/redo", TTR("Redo"), KEY_MASK_SHIFT + KEY_MASK_CMD + KEY_Z), EDIT_REDO, true);
p->add_separator(); p->add_separator();
p->add_shortcut(ED_SHORTCUT("editor/revert_scene", TTR("Revert Scene")), EDIT_REVERT); p->add_shortcut(ED_SHORTCUT("editor/reload_saved_scene", TTR("Reload Saved Scene")), EDIT_RELOAD_SAVED_SCENE);
p->add_shortcut(ED_SHORTCUT("editor/close_scene", TTR("Close Scene"), KEY_MASK_SHIFT + KEY_MASK_CMD + KEY_W), FILE_CLOSE); p->add_shortcut(ED_SHORTCUT("editor/close_scene", TTR("Close Scene"), KEY_MASK_SHIFT + KEY_MASK_CMD + KEY_W), FILE_CLOSE);
recent_scenes = memnew(PopupMenu); recent_scenes = memnew(PopupMenu);

2
editor/editor_node.h
View File

@ -150,7 +150,7 @@ private:
FILE_EXTERNAL_OPEN_SCENE, FILE_EXTERNAL_OPEN_SCENE,
EDIT_UNDO, EDIT_UNDO,
EDIT_REDO, EDIT_REDO,
EDIT_REVERT, EDIT_RELOAD_SAVED_SCENE,
TOOLS_ORPHAN_RESOURCES, TOOLS_ORPHAN_RESOURCES,
TOOLS_CUSTOM, TOOLS_CUSTOM,
RESOURCE_SAVE, RESOURCE_SAVE,