Merge pull request #3930 from TheHX/issue-3801

Removed "__editor_plugin_screen__" metadata creation
This commit is contained in:
Rémi Verschelde 2016-03-05 17:11:26 +01:00
commit 218bb112e5
1 changed files with 0 additions and 19 deletions

View File

@ -981,11 +981,6 @@ void EditorNode::_save_scene(String p_file) {
editor_data.apply_changes_in_editors(); editor_data.apply_changes_in_editors();
if (editor_plugin_screen) {
scene->set_meta("__editor_plugin_screen__",editor_plugin_screen->get_name());
}
_set_scene_metadata(p_file); _set_scene_metadata(p_file);
@ -3692,26 +3687,12 @@ Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps,bo
*/ */
editor_data.set_edited_scene_import_metadata( sdata->get_import_metadata() ); editor_data.set_edited_scene_import_metadata( sdata->get_import_metadata() );
// editor_data.get_undo_redo().clear_history(); // editor_data.get_undo_redo().clear_history();
saved_version=editor_data.get_undo_redo().get_version(); saved_version=editor_data.get_undo_redo().get_version();
_update_title(); _update_title();
_update_scene_tabs(); _update_scene_tabs();
_add_to_recent_scenes(lpath); _add_to_recent_scenes(lpath);
if (new_scene->has_meta("__editor_plugin_screen__")) {
String editor = new_scene->get_meta("__editor_plugin_screen__");
for(int i=0;i<editor_table.size();i++) {
if (editor_table[i]->get_name()==editor) {
_editor_select(i);
break;
}
}
}
prev_scene->set_disabled(previous_scenes.size()==0); prev_scene->set_disabled(previous_scenes.size()==0);
opening_prev=false; opening_prev=false;