1 files changed, 133 insertions, 11 deletions

diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp
index 89036d2581..5877ce1a43 100644
--- a/tools/editor/scene_tree_dock.cpp
+++ b/tools/editor/scene_tree_dock.cpp
@@ -35,7 +35,10 @@
 #include "tools/editor/plugins/canvas_item_editor_plugin.h"
 #include "script_editor_debugger.h"
 #include "tools/editor/plugins/script_editor_plugin.h"
+#include "core/io/resource_saver.h"
 #include "multi_node_edit.h"
+#include "tools/editor/plugins/animation_player_editor_plugin.h"
+#include "animation_editor.h"
 
 void SceneTreeDock::_unhandled_key_input(InputEvent p_event) {
 
@@ -291,7 +294,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			for (int i = 0; i < selection.size(); i++) {
 				Node *top_node = selection[i];
 				Node *bottom_node = selection[selection.size() - 1 - i];
-				 
+
 				ERR_FAIL_COND(!top_node->get_parent());
 				ERR_FAIL_COND(!bottom_node->get_parent());
 
@@ -397,7 +400,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 					editor_data->get_undo_redo().add_do_method(d,"set_owner",node->get_owner());
 				}
 				editor_data->get_undo_redo().add_do_method(editor_selection,"add_node",dup);
-				editor_data->get_undo_redo().add_undo_method(parent,"remove_child",dup);								
+				editor_data->get_undo_redo().add_undo_method(parent,"remove_child",dup);
 				editor_data->get_undo_redo().add_do_reference(dup);
 
 				ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
@@ -485,7 +488,54 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 				delete_dialog->popup_centered_minsize();
 			}
 
+		} break;
+		case TOOL_NEW_SCENE_FROM: {
+
+			Node *scene = editor_data->get_edited_scene_root();
+
+			if (!scene) {
+				accept->get_ok()->set_text("I see..");
+				accept->set_text("This operation can't be done without a scene.");
+				accept->popup_centered_minsize();
+				break;
+			}
+
+			List<Node*> selection = editor_selection->get_selected_node_list();
+
+			if (selection.size()!=1) {
+				accept->get_ok()->set_text("I see..");
+				accept->set_text("This operation requires a single selected node.");
+				accept->popup_centered_minsize();
+				break;
+			}
+
+			Node *tocopy = selection.front()->get();
 
+			if (tocopy!=editor_data->get_edited_scene_root() && tocopy->get_filename()!="") {
+				accept->get_ok()->set_text("I see..");
+				accept->set_text("This operation can't be done on instanced scenes.");
+				accept->popup_centered_minsize();
+				break;
+			}
+
+			new_scene_from_dialog->set_mode(EditorFileDialog::MODE_SAVE_FILE);
+
+			List<String> extensions;
+			Ref<PackedScene> sd = memnew( PackedScene );
+			ResourceSaver::get_recognized_extensions(sd,&extensions);
+			new_scene_from_dialog->clear_filters();
+			for(int i=0;i<extensions.size();i++) {
+				new_scene_from_dialog->add_filter("*."+extensions[i]+" ; "+extensions[i].to_upper());
+			}
+
+			String existing;
+			if (extensions.size()) {
+				existing="new_scene."+extensions.front()->get().to_lower();
+			}
+			new_scene_from_dialog->set_current_path(existing);
+
+			new_scene_from_dialog->popup_centered_ratio();
+			new_scene_from_dialog->set_title("Save New Scene As..");
 
 		} break;
 
@@ -520,6 +570,7 @@ void SceneTreeDock::_notification(int p_what) {
 				"MoveDown",
 				"Duplicate",
 				"Reparent",
+				"CreateNewSceneFrom",
 				"MultiNodeEdit",
 				"Remove",
 			};
@@ -875,7 +926,7 @@ bool SceneTreeDock::_validate_no_foreign() {
 
 		}
 
-        if (edited_scene->get_scene_inherited_state().is_valid() && edited_scene->get_scene_inherited_state()->find_node_by_path(edited_scene->get_path_to(E->get()))>=0) {
+	if (edited_scene->get_scene_inherited_state().is_valid() && edited_scene->get_scene_inherited_state()->find_node_by_path(edited_scene->get_path_to(E->get()))>=0) {
 
 			accept->get_ok()->set_text("Makes Sense!");
 			accept->set_text("Can't operate on nodes the current scene inherits from!");
@@ -968,8 +1019,8 @@ void SceneTreeDock::_node_reparent(NodePath p_path,bool p_keep_global_xform) {
 
 		editor_data->get_undo_redo().add_do_method(this,"_set_owners",edited_scene,owners);
 
-		if (editor->get_animation_editor()->get_root()==node)
-			editor_data->get_undo_redo().add_do_method(editor->get_animation_editor(),"set_root",node);
+		if (AnimationPlayerEditor::singleton->get_key_editor()->get_root()==node)
+			editor_data->get_undo_redo().add_do_method(AnimationPlayerEditor::singleton->get_key_editor(),"set_root",node);
 
 		editor_data->get_undo_redo().add_undo_method(new_parent,"remove_child",node);
 
@@ -996,8 +1047,8 @@ void SceneTreeDock::_node_reparent(NodePath p_path,bool p_keep_global_xform) {
 		editor_data->get_undo_redo().add_undo_method(node->get_parent(),"add_child",node);
 		editor_data->get_undo_redo().add_undo_method(node->get_parent(),"move_child",node,child_pos);
 		editor_data->get_undo_redo().add_undo_method(this,"_set_owners",edited_scene,owners);
-		if (editor->get_animation_editor()->get_root()==node)
-			editor_data->get_undo_redo().add_undo_method(editor->get_animation_editor(),"set_root",node);
+		if (AnimationPlayerEditor::singleton->get_key_editor()->get_root()==node)
+			editor_data->get_undo_redo().add_undo_method(AnimationPlayerEditor::singleton->get_key_editor(),"set_root",node);
 
 		if (p_keep_global_xform) {
 			if (node->cast_to<Node2D>())
@@ -1103,8 +1154,8 @@ void SceneTreeDock::_delete_confirm() {
 			editor_data->get_undo_redo().add_do_method(n->get_parent(),"remove_child",n);
 			editor_data->get_undo_redo().add_undo_method(n->get_parent(),"add_child",n);
 			editor_data->get_undo_redo().add_undo_method(n->get_parent(),"move_child",n,n->get_index());
-			if (editor->get_animation_editor()->get_root()==n)
-				editor_data->get_undo_redo().add_undo_method(editor->get_animation_editor(),"set_root",n);
+			if (AnimationPlayerEditor::singleton->get_key_editor()->get_root()==n)
+				editor_data->get_undo_redo().add_undo_method(AnimationPlayerEditor::singleton->get_key_editor(),"set_root",n);
 			editor_data->get_undo_redo().add_undo_method(this,"_set_owners",edited_scene,owners);
 			//editor_data->get_undo_redo().add_undo_method(n,"set_owner",n->get_owner());
 			editor_data->get_undo_redo().add_undo_reference(n);
@@ -1140,6 +1191,7 @@ void SceneTreeDock::_update_tool_buttons() {
 	tool_buttons[TOOL_DUPLICATE]->set_disabled(disable_root);
 	tool_buttons[TOOL_REPARENT]->set_disabled(disable_root);
 	tool_buttons[TOOL_ERASE]->set_disabled(disable);
+	tool_buttons[TOOL_NEW_SCENE_FROM]->set_disabled(disable_root);
 	tool_buttons[TOOL_MULTI_EDIT]->set_disabled(EditorNode::get_singleton()->get_editor_selection()->get_selection().size()<2);
 
 
@@ -1279,7 +1331,7 @@ void SceneTreeDock::_create() {
 		editor->push_item(newnode);
 
 		memdelete(n);
-		
+
 		_update_tool_buttons();
 
 	}
@@ -1326,6 +1378,59 @@ void SceneTreeDock::_import_subscene() {
 */
 }
 
+void SceneTreeDock::_new_scene_from(String p_file) {
+
+	List<Node*> selection = editor_selection->get_selected_node_list();
+
+	if (selection.size()!=1) {
+		accept->get_ok()->set_text("I see..");
+		accept->set_text("This operation requires a single selected node.");
+		accept->popup_centered_minsize();
+		return;
+	}
+
+	Node *base = selection.front()->get();
+
+	Map<Node*,Node*> reown;
+	reown[editor_data->get_edited_scene_root()]=base;
+	Node *copy = base->duplicate_and_reown(reown);
+	if (copy) {
+
+		Ref<PackedScene> sdata = memnew( PackedScene );
+		Error err = sdata->pack(copy);
+		memdelete(copy);
+
+		if (err!=OK) {
+			accept->get_ok()->set_text("I see..");
+			accept->set_text("Couldn't save new scene. Likely dependencies (instances) couldn't be satisfied.");
+			accept->popup_centered_minsize();
+			return;
+		}
+
+		int flg=0;
+		if (EditorSettings::get_singleton()->get("on_save/compress_binary_resources"))
+			flg|=ResourceSaver::FLAG_COMPRESS;
+		if (EditorSettings::get_singleton()->get("on_save/save_paths_as_relative"))
+			flg|=ResourceSaver::FLAG_RELATIVE_PATHS;
+
+
+		err = ResourceSaver::save(p_file,sdata,flg);
+		if (err!=OK) {
+			accept->get_ok()->set_text("I see..");
+			accept->set_text("Error saving scene.");
+			accept->popup_centered_minsize();
+			return;
+		}
+
+	} else {
+		accept->get_ok()->set_text("I see..");
+		accept->set_text("Error duplicating scene to save it.");
+		accept->popup_centered_minsize();
+		return;
+	}
+
+}
+
 void SceneTreeDock::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("_tool_selected"),&SceneTreeDock::_tool_selected);
@@ -1343,6 +1448,7 @@ void SceneTreeDock::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_node_prerenamed"),&SceneTreeDock::_node_prerenamed);
 	ObjectTypeDB::bind_method(_MD("_import_subscene"),&SceneTreeDock::_import_subscene);
 	ObjectTypeDB::bind_method(_MD("_selection_changed"),&SceneTreeDock::_selection_changed);
+	ObjectTypeDB::bind_method(_MD("_new_scene_from"),&SceneTreeDock::_new_scene_from);
 
 	ObjectTypeDB::bind_method(_MD("instance"),&SceneTreeDock::instance);
 }
@@ -1415,9 +1521,10 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor,Node *p_scene_root,EditorSelec
 	scene_tree->set_undo_redo(&editor_data->get_undo_redo());
 	scene_tree->set_editor_selection(editor_selection);
 
+
 	HBoxContainer *hbc_bottom = memnew( HBoxContainer );
 	vbc->add_child(hbc_bottom);
-
+	hbc_bottom->add_constant_override("separation", 0);
 
 	tb = memnew( ToolButton );
 	tb->connect("pressed",this,"_tool_selected",make_binds(TOOL_MOVE_UP, false));
@@ -1446,6 +1553,12 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor,Node *p_scene_root,EditorSelec
 	hbc_bottom->add_spacer();
 
 	tb = memnew( ToolButton );
+	tb->connect("pressed",this,"_tool_selected",make_binds(TOOL_NEW_SCENE_FROM, false));
+	tb->set_tooltip("Create New Scene From Node(s)");
+	hbc_bottom->add_child(tb);
+	tool_buttons[TOOL_NEW_SCENE_FROM]=tb;
+
+	tb = memnew( ToolButton );
 	tb->connect("pressed",this,"_tool_selected",make_binds(TOOL_MULTI_EDIT, false));
 	tb->set_tooltip("Multi-Edit Selected Nodes");
 	hbc_bottom->add_child(tb);
@@ -1465,12 +1578,15 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor,Node *p_scene_root,EditorSelec
 	groups_editor = memnew( GroupsEditor );
 	add_child(groups_editor);
 	groups_editor->set_undo_redo(&editor_data->get_undo_redo());
+
 	connect_dialog = memnew( ConnectionsDialog(p_editor) );
 	add_child(connect_dialog);
 	connect_dialog->set_undoredo(&editor_data->get_undo_redo());
+
 	script_create_dialog = memnew( ScriptCreateDialog );
 	add_child(script_create_dialog);
 	script_create_dialog->connect("script_created",this,"_script_created");
+
 	reparent_dialog = memnew( ReparentDialog );
 	add_child(reparent_dialog);
 	reparent_dialog->connect("reparent",this,"_node_reparent");
@@ -1486,10 +1602,16 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor,Node *p_scene_root,EditorSelec
 	delete_dialog = memnew( ConfirmationDialog );
 	add_child(delete_dialog);
 	delete_dialog->connect("confirmed",this,"_delete_confirm");
+
 	import_subscene_dialog = memnew( EditorSubScene );
 	add_child(import_subscene_dialog);
 	import_subscene_dialog->connect("subscene_selected",this,"_import_subscene");
 
+	new_scene_from_dialog = memnew( EditorFileDialog );
+	new_scene_from_dialog->set_mode(EditorFileDialog::MODE_SAVE_FILE);
+	add_child(new_scene_from_dialog);
+	new_scene_from_dialog->connect("file_selected",this,"_new_scene_from");
+
 	first_enter=true;