Merge pull request #8374 from nunodonato/killimport

Removed the deprecated Import menu from the main editor.

editor/editor_node.cpp

@@ -447,18 +447,6 @@ void EditorNode::_sources_changed(bool p_exist) {
 void EditorNode::_vp_resized() {
 }
 
-void EditorNode::_rebuild_import_menu() {
-	PopupMenu *p = import_menu->get_popup();
-	p->clear();
-//p->add_item(TTR("Node From Scene"), FILE_IMPORT_SUBSCENE);
-//p->add_separator();
-#if 0
-	for (int i = 0; i < editor_import_export->get_import_plugin_count(); i++) {
-		p->add_item(editor_import_export->get_import_plugin(i)->get_visible_name(), IMPORT_PLUGIN_BASE + i);
-	}
-#endif
-}
-
 void EditorNode::_node_renamed() {
 
 	if (property_editor)
@@ -5257,15 +5245,6 @@ EditorNode::EditorNode() {
 	menu_panel->add_child( resource_menu );
 #endif
 
-	import_menu = memnew(MenuButton);
-	import_menu->set_tooltip(TTR("Import assets to the project."));
-	import_menu->set_text(TTR("Import"));
-	//import_menu->set_icon(gui_base->get_icon("Save","EditorIcons"));
-	left_menu_hb->add_child(import_menu);
-
-	p = import_menu->get_popup();
-	p->connect("id_pressed", this, "_menu_option");
-
 	tool_menu = memnew(MenuButton);
 	tool_menu->set_tooltip(TTR("Miscellaneous project or scene-wide tools."));
 	tool_menu->set_text(TTR("Tools"));
@@ -5960,8 +5939,6 @@ EditorNode::EditorNode() {
 	circle_step_frame = Engine::get_singleton()->get_frames_drawn();
 	circle_step = 0;
 
-	_rebuild_import_menu();
-
 	editor_plugin_screen = NULL;
 	editor_plugins_over = memnew(EditorPluginList);
 

editor/editor_node.h

@@ -242,7 +242,6 @@ private:
 	HBoxContainer *menu_hb;
 	Control *viewport;
 	MenuButton *file_menu;
-	MenuButton *import_menu;
 	MenuButton *tool_menu;
 	ToolButton *export_button;
 	ToolButton *prev_scene;
@@ -447,8 +446,6 @@ private:
 	void _show_messages();
 	void _vp_resized();
 
-	void _rebuild_import_menu();
-
 	void _save_scene(String p_file, int idx = -1);
 
 	void _instance_request(const Vector<String> &p_files);