asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8374 from nunodonato/killimport

Browse source 
Removed the deprecated Import menu from the main editor.
This commit is contained in:
Andreas Haas 2017-04-14 17:50:16 +02:00 committed by GitHub
commit 58edf26500
2 changed files with 0 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
editor/editor_node.cpp
View file

@ -447,18 +447,6 @@ void EditorNode::_sources_changed(bool p_exist) {
void EditorNode::_vp_resized() { 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() { void EditorNode::_node_renamed() {
if (property_editor) if (property_editor)
@ -5257,15 +5245,6 @@ EditorNode::EditorNode() {
menu_panel->add_child( resource_menu ); menu_panel->add_child( resource_menu );
#endif #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 = memnew(MenuButton);
tool_menu->set_tooltip(TTR("Miscellaneous project or scene-wide tools.")); tool_menu->set_tooltip(TTR("Miscellaneous project or scene-wide tools."));
tool_menu->set_text(TTR("Tools")); tool_menu->set_text(TTR("Tools"));
@ -5960,8 +5939,6 @@ EditorNode::EditorNode() {
circle_step_frame = Engine::get_singleton()->get_frames_drawn(); circle_step_frame = Engine::get_singleton()->get_frames_drawn();
circle_step = 0; circle_step = 0;
_rebuild_import_menu();
editor_plugin_screen = NULL; editor_plugin_screen = NULL;
editor_plugins_over = memnew(EditorPluginList); editor_plugins_over = memnew(EditorPluginList);

3
editor/editor_node.h
View file

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