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

-Fixed revert scene, should work proprely now, fixes #2782

Browse Source
This commit is contained in:
Juan Linietsky
2016-01-23 18:28:30 -03:00
parent 784a3eeb90
commit 5ca338bab6
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/editor/editor_node.cpp
View File

@@ -2367,7 +2367,14 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
if (!scene)
break;
String filename = scene->get_filename();
if (filename==String()) {
show_warning("Can't reload a scene that was never saved..");
break;
}
if (unsaved_cache && !p_confirmed) {
confirmation->get_ok()->set_text("Revert");
confirmation->set_text("This action cannot be undone. Revert anyway?");
@@ -2375,7 +2382,13 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
break;
}
Error err = load_scene(scene->get_filename());
int cur_idx = editor_data.get_edited_scene();
_remove_edited_scene();
Error err = load_scene(filename);
editor_data.move_edited_scene_to_index(cur_idx);
get_undo_redo()->clear_history();
scene_tabs->set_current_tab(cur_idx);
} break;