Removed import/export system, will start new one from scratch.

34 files changed, 98 insertions, 160 deletions

diff --git a/tools/editor/SCsub b/tools/editor/SCsub
index caf45d25b..85d4d1107 100644
--- a/tools/editor/SCsub
+++ b/tools/editor/SCsub
@@ -55,7 +55,7 @@ if (env["tools"] == "yes"):
     reg_exporters = 'void register_exporters() {\n'
     for e in env.platform_exporters:
         env.tool_sources.append("#platform/" + e + "/export/export.cpp")
-        reg_exporters += '\tregister_' + e + '_exporter();\n'
+        reg_exporters += '\t//register_' + e + '_exporter();\n'
         reg_exporters_inc += '#include "platform/' + e + '/export/export.h"\n'
     reg_exporters += '}\n'
     f = open("register_exporters.cpp", "wb")
diff --git a/tools/editor/editor_data.cpp b/tools/editor/editor_data.cpp
index 44de1836b..ef839d7e7 100644
--- a/tools/editor/editor_data.cpp
+++ b/tools/editor/editor_data.cpp
@@ -769,26 +769,6 @@ Dictionary EditorData::restore_edited_scene_state(EditorSelection *p_selection,
 }
 
 
-void EditorData::set_edited_scene_import_metadata(Ref<ResourceImportMetadata> p_mdata) {
-
-	ERR_FAIL_INDEX(current_edited_scene,edited_scene.size());
-	edited_scene[current_edited_scene].medatata=p_mdata;
-
-}
-
-Ref<ResourceImportMetadata> EditorData::get_edited_scene_import_metadata(int idx) const{
-
-	ERR_FAIL_INDEX_V(current_edited_scene,edited_scene.size(),Ref<ResourceImportMetadata>());
-	if(idx<0) {
-		return edited_scene[current_edited_scene].medatata;
-	} else {
-		ERR_FAIL_INDEX_V(idx,edited_scene.size(),Ref<ResourceImportMetadata>());
-		return edited_scene[idx].medatata;
-	}
-}
-
-
-
 void EditorData::clear_edited_scenes() {
 
 	for(int i=0;i<edited_scene.size();i++) {
diff --git a/tools/editor/editor_data.h b/tools/editor/editor_data.h
index f0bc5983a..fce606f72 100644
--- a/tools/editor/editor_data.h
+++ b/tools/editor/editor_data.h
@@ -129,7 +129,6 @@ private:
 	struct EditedScene {
 		Node* root;
 		Dictionary editor_states;
-		Ref<ResourceImportMetadata> medatata;
 		List<Node*> selection;
 		Vector<EditorHistory::History> history_stored;
 		int history_current;
@@ -184,8 +183,6 @@ public:
 	void remove_scene(int p_idx);
 	void set_edited_scene(int p_idx);
 	void set_edited_scene_root(Node* p_root);
-	void set_edited_scene_import_metadata(Ref<ResourceImportMetadata> p_mdata);
-	Ref<ResourceImportMetadata> get_edited_scene_import_metadata(int p_idx = -1) const;
 	int get_edited_scene() const;
 	Node* get_edited_scene_root(int p_idx = -1);
 	int get_edited_scene_count() const;
diff --git a/tools/editor/editor_file_system.cpp b/tools/editor/editor_file_system.cpp
index 39869beef..120cbb971 100644
--- a/tools/editor/editor_file_system.cpp
+++ b/tools/editor/editor_file_system.cpp
@@ -247,6 +247,8 @@ EditorFileSystemDirectory::~EditorFileSystemDirectory() {
 
 EditorFileSystemDirectory::ImportMeta EditorFileSystem::_get_meta(const String& p_path) {
 
+	return EditorFileSystemDirectory::ImportMeta();
+#if 0
 	Ref<ResourceImportMetadata> imd = ResourceLoader::load_import_metadata(p_path);
 	EditorFileSystemDirectory::ImportMeta m;
 	if (imd.is_null()) {
@@ -274,6 +276,7 @@ EditorFileSystemDirectory::ImportMeta EditorFileSystem::_get_meta(const String&
 	}
 
 	return m;
+#endif
 }
 
 
@@ -535,7 +538,7 @@ bool EditorFileSystem::_check_meta_sources(EditorFileSystemDirectory::ImportMeta
 
 		for(int j=0;j<p_meta.sources.size();j++) {
 
-
+#if 0
 			String src = EditorImportPlugin::expand_source_path(p_meta.sources[j].path);
 
 			if (!FileAccess::exists(src)) {
@@ -559,6 +562,7 @@ bool EditorFileSystem::_check_meta_sources(EditorFileSystemDirectory::ImportMeta
 				}
 				p_meta.sources[j].modified_time=mt;
 			}
+#endif
 		}
 	}
 
diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp
index 6ef238920..b79bf7042 100644
--- a/tools/editor/editor_import_export.cpp
+++ b/tools/editor/editor_import_export.cpp
@@ -28,6 +28,7 @@
 /*************************************************************************/
 #include "editor_import_export.h"
 
+#if 0
 #include "version.h"
 #include "script_language.h"
 #include "globals.h"
@@ -2302,3 +2303,4 @@ EditorImportExport::~EditorImportExport() {
 
 
 }
+#endif
diff --git a/tools/editor/editor_import_export.h b/tools/editor/editor_import_export.h
index fb75373f1..2654a4ea3 100644
--- a/tools/editor/editor_import_export.h
+++ b/tools/editor/editor_import_export.h
@@ -29,6 +29,8 @@
 #ifndef EDITOR_IMPORT_EXPORT_H
 #define EDITOR_IMPORT_EXPORT_H
 
+#if 0
+
 #include "resource.h"
 #include "scene/main/node.h"
 #include "scene/resources/texture.h"
@@ -419,4 +421,5 @@ VARIANT_ENUM_CAST(EditorImportExport::ImageAction);
 VARIANT_ENUM_CAST(EditorImportExport::ScriptAction);
 VARIANT_ENUM_CAST(EditorImportExport::SampleAction);
 
+#endif
 #endif // EDITOR_IMPORT_EXPORT_H
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index bd54eaceb..4bbef01ac 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -431,7 +431,7 @@ void EditorNode::_fs_changed() {
 
 	if (export_defer.platform!="") {
 
-		project_export_settings->export_platform(export_defer.platform,export_defer.path,export_defer.debug,export_defer.password,true);
+		//project_export_settings->export_platform(export_defer.platform,export_defer.path,export_defer.debug,export_defer.password,true);
 		export_defer.platform="";
 	}
 
@@ -448,7 +448,7 @@ void EditorNode::_sources_changed(bool p_exist) {
 
 		EditorProgress ep("reimport",TTR("Re-Importing"),changed_sources.size());
 		int step_idx=0;
-
+#if 0
 		for(List<String>::Element *E=changed_sources.front();E;E=E->next()) {
 
 			ep.step(TTR("Importing:")+" "+E->get(),step_idx++);
@@ -467,7 +467,7 @@ void EditorNode::_sources_changed(bool p_exist) {
 			}
 
 		}
-
+#endif
 		EditorFileSystem::get_singleton()->scan_sources();
 		waiting_for_sources_changed=false;
 
@@ -502,9 +502,11 @@ void EditorNode::_rebuild_import_menu()
 	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() {
@@ -1008,7 +1010,6 @@ void EditorNode::_save_scene(String p_file, int idx) {
 		return;
 	}
 
-	sdata->set_import_metadata(editor_data.get_edited_scene_import_metadata(idx));
 	int flg=0;
 	if (EditorSettings::get_singleton()->get("filesystem/on_save/compress_binary_resources"))
 		flg|=ResourceSaver::FLAG_COMPRESS;
@@ -2282,7 +2283,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 
 		case FILE_EXPORT_PROJECT: {
 
-			project_export_settings->popup_export();
+			//project_export_settings->popup_export();
 			/*
 			String target = export_db->get_current_platform();
 			Ref<EditorExporter> exporter = export_db->get_exporter(target);
@@ -2861,7 +2862,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 		} break;
 		case SOURCES_REIMPORT: {
 
-			reimport_dialog->popup_reimport();
+			//reimport_dialog->popup_reimport();
 		} break;
 		case DEPENDENCY_LOAD_CHANGED_IMAGES: {
 
@@ -2951,10 +2952,6 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 					current->call(name);
 			} else if (p_option>=IMPORT_PLUGIN_BASE) {
 
-				Ref<EditorImportPlugin> p = editor_import_export->get_import_plugin(p_option-IMPORT_PLUGIN_BASE);
-				if (p.is_valid()) {
-					p->import_dialog();
-				}
 
 			}
 		}
@@ -3055,20 +3052,6 @@ void EditorNode::remove_editor_plugin(EditorPlugin *p_editor) {
 }
 
 
-void EditorNode::add_editor_import_plugin(const Ref<EditorImportPlugin>& p_editor_import) {
-
-	ERR_FAIL_COND( p_editor_import.is_null() );
-	editor_import_export->add_import_plugin(p_editor_import);
-	_rebuild_import_menu();
-}
-
-void EditorNode::remove_editor_import_plugin(const Ref<EditorImportPlugin>& p_editor_import) {
-	ERR_FAIL_COND( p_editor_import.is_null() );
-
-	editor_import_export->remove_import_plugin(p_editor_import);
-	_rebuild_import_menu();
-}
-
 
 void EditorNode::_update_addon_config() {
 
@@ -3812,7 +3795,6 @@ Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps,bo
 	property_editor->edit(new_scene);
 	editor_data.set_edited_scene_root(new_scene);
 */
-	editor_data.set_edited_scene_import_metadata( sdata->get_import_metadata() );
 
 	//editor_data.get_undo_redo().clear_history();
 	saved_version=editor_data.get_undo_redo().get_version();
@@ -4155,9 +4137,9 @@ bool EditorNode::is_scene_in_use(const String& p_path) {
 void EditorNode::register_editor_types() {
 
 	ClassDB::register_class<EditorPlugin>();
-	ClassDB::register_class<EditorImportPlugin>();
-	ClassDB::register_class<EditorExportPlugin>();
-	ClassDB::register_class<EditorScenePostImport>();
+//	ClassDB::register_class<EditorImportPlugin>();
+//	ClassDB::register_class<EditorExportPlugin>();
+//	ClassDB::register_class<EditorScenePostImport>();
 	ClassDB::register_class<EditorScript>();
 	ClassDB::register_class<EditorSelection>();
 	ClassDB::register_class<EditorFileDialog>();
@@ -5187,9 +5169,9 @@ Variant EditorNode::drag_files_and_dirs(const Vector<String>& p_files, Control *
 void EditorNode::_dropped_files(const Vector<String>& p_files,int p_screen) {
 
 	String cur_path = filesystem_dock->get_current_path();
-	for(int i=0;i<EditorImportExport::get_singleton()->get_import_plugin_count();i++) {
-		EditorImportExport::get_singleton()->get_import_plugin(i)->import_from_drop(p_files,cur_path);
-	}
+//	for(int i=0;i<EditorImportExport::get_singleton()->get_import_plugin_count();i++) {
+//		EditorImportExport::get_singleton()->get_import_plugin(i)->import_from_drop(p_files,cur_path);
+//	}
 }
 void EditorNode::_file_access_close_error_notify(const String& p_str) {
 
@@ -5369,8 +5351,8 @@ void EditorNode::_bind_methods() {
 
 
 
-	ClassDB::bind_method(_MD("add_editor_import_plugin", "plugin"), &EditorNode::add_editor_import_plugin);
-	ClassDB::bind_method(_MD("remove_editor_import_plugin", "plugin"), &EditorNode::remove_editor_import_plugin);
+//	ClassDB::bind_method(_MD("add_editor_import_plugin", "plugin"), &EditorNode::add_editor_import_plugin);
+	//ClassDB::bind_method(_MD("remove_editor_import_plugin", "plugin"), &EditorNode::remove_editor_import_plugin);
 	ClassDB::bind_method(_MD("get_gui_base"), &EditorNode::get_gui_base);
 	ClassDB::bind_method(_MD("_bottom_panel_switch"), &EditorNode::_bottom_panel_switch);
 
@@ -5423,7 +5405,6 @@ EditorNode::EditorNode() {
 
 	FileAccess::set_backup_save(true);
 
-	PathRemap::get_singleton()->clear_remaps(); //editor uses no remaps
 	TranslationServer::get_singleton()->set_enabled(false);
 	// load settings
 	if (!EditorSettings::get_singleton())
@@ -5476,13 +5457,8 @@ EditorNode::EditorNode() {
 	EditorFileDialog::unregister_func=_editor_file_dialog_unregister;
 
 
-	editor_import_export = memnew( EditorImportExport );
-	add_child(editor_import_export);
-
 	register_exporters();
 
-	editor_import_export->load_config();
-
 	GLOBAL_DEF("editor/main_run_args","$scene");
 
 	ClassDB::set_class_enabled("CollisionShape",true);
@@ -6396,11 +6372,11 @@ EditorNode::EditorNode() {
 	//gui_base->add_child(optimized_save);
 	//optimized_save->connect("confirmed",this,"_save_optimized");
 
-	project_export = memnew( ProjectExport(&editor_data) );
-	gui_base->add_child(project_export);
+	//project_export = memnew( ProjectExport(&editor_data) );
+	//gui_base->add_child(project_export);
 
-	project_export_settings = memnew( ProjectExportDialog(this) );
-	gui_base->add_child(project_export_settings);
+	//project_export_settings = memnew( ProjectExportDialog(this) );
+	//gui_base->add_child(project_export_settings);
 
 	//optimized_presets = memnew( OptimizedPresetsDialog(&editor_data) );
 	//gui_base->add_child(optimized_presets);
@@ -6514,8 +6490,8 @@ EditorNode::EditorNode() {
 	gui_base->add_child(file_script);
 	file_script->connect("file_selected",this,"_dialog_action");
 
-	reimport_dialog = memnew( EditorReImportDialog );
-	gui_base->add_child(reimport_dialog);
+	//reimport_dialog = memnew( EditorReImportDialog );
+	//gui_base->add_child(reimport_dialog);
 
 
 
@@ -6541,26 +6517,6 @@ EditorNode::EditorNode() {
 	file_server = memnew( EditorFileServer );
 
 
-	editor_import_export->add_import_plugin( Ref<EditorTextureImportPlugin>( memnew(EditorTextureImportPlugin(this) )));
-	Ref<EditorSceneImportPlugin> _scene_import =  memnew(EditorSceneImportPlugin(this) );
-	Ref<EditorSceneImporterCollada> _collada_import = memnew( EditorSceneImporterCollada);
-	_scene_import->add_importer(_collada_import);
-	//Ref<EditorSceneImporterFBXConv> _fbxconv_import = memnew( EditorSceneImporterFBXConv);
-	//_scene_import->add_importer(_fbxconv_import);
-	editor_import_export->add_import_plugin( _scene_import);
-	// TODO: This plugin has no code, it should be either implemented or dropped (GH-3667)
-	// editor_import_export->add_import_plugin( Ref<EditorSceneAnimationImportPlugin>( memnew(EditorSceneAnimationImportPlugin(this))));
-	editor_import_export->add_import_plugin( Ref<EditorMeshImportPlugin>( memnew(EditorMeshImportPlugin(this))));
-	editor_import_export->add_import_plugin( Ref<EditorFontImportPlugin>( memnew(EditorFontImportPlugin(this))));
-//	editor_import_export->add_import_plugin( Ref<EditorSampleImportPlugin>( memnew(EditorSampleImportPlugin(this))));
-	editor_import_export->add_import_plugin( Ref<EditorTranslationImportPlugin>( memnew(EditorTranslationImportPlugin(this))));
-	editor_import_export->add_import_plugin( Ref<EditorBitMaskImportPlugin>( memnew(EditorBitMaskImportPlugin(this))));
-
-
-	editor_import_export->add_export_plugin( Ref<EditorTextureExportPlugin>( memnew(EditorTextureExportPlugin)));
-//	editor_import_export->add_export_plugin( Ref<EditorSampleExportPlugin>( memnew(EditorSampleExportPlugin)));
-	editor_import_export->add_export_plugin( Ref<EditorSceneExportPlugin>( memnew(EditorSceneExportPlugin)));
-
 
 	add_editor_plugin( memnew( AnimationPlayerEditorPlugin(this) ) );
 	add_editor_plugin( memnew( CanvasItemEditorPlugin(this) ) );
diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h
index fbba7ae7a..faf11f5d2 100644
--- a/tools/editor/editor_node.h
+++ b/tools/editor/editor_node.h
@@ -340,7 +340,7 @@ private:
 	Vector<ToolButton*> main_editor_buttons;
 	Vector<EditorPlugin*> editor_table;
 
-	EditorReImportDialog *reimport_dialog;
+//	EditorReImportDialog *reimport_dialog;
 
 	ProgressDialog *progress_dialog;
 	BackgroundProgress *progress_hb;
@@ -391,8 +391,8 @@ private:
 	EditorData editor_data;
 	EditorRun editor_run;
 	EditorSelection *editor_selection;
-	ProjectExport *project_export;
-	ProjectExportDialog *project_export_settings;
+//	ProjectExport *project_export;
+//	ProjectExportDialog *project_export_settings;
 	EditorResourcePreview *resource_preview;
 
 	EditorFileServer *file_server;
@@ -647,9 +647,6 @@ public:
 	void add_control_to_dock(DockSlot p_slot,Control* p_control);
 	void remove_control_from_dock(Control* p_control);
 
-	void add_editor_import_plugin(const Ref<EditorImportPlugin>& p_editor_import);
-	void remove_editor_import_plugin(const Ref<EditorImportPlugin>& p_editor_import);
-
 	void set_addon_plugin_enabled(const String& p_addon,bool p_enabled);
 	bool is_addon_plugin_enabled(const String &p_addon) const;
 
diff --git a/tools/editor/editor_plugin.cpp b/tools/editor/editor_plugin.cpp
index 2f59b0bd0..2f44b5558 100644
--- a/tools/editor/editor_plugin.cpp
+++ b/tools/editor/editor_plugin.cpp
@@ -319,27 +319,6 @@ EditorResourcePreview *EditorPlugin::get_resource_previewer() {
 	return EditorResourcePreview::get_singleton();
 }
 
-void EditorPlugin::add_import_plugin(const Ref<EditorImportPlugin>& p_editor_import) {
-
-	EditorNode::get_singleton()->add_editor_import_plugin(p_editor_import);
-}
-
-void EditorPlugin::remove_import_plugin(const Ref<EditorImportPlugin>& p_editor_import){
-
-	EditorNode::get_singleton()->remove_editor_import_plugin(p_editor_import);
-
-}
-
-void EditorPlugin::add_export_plugin(const Ref<EditorExportPlugin>& p_editor_export){
-
-	EditorImportExport::get_singleton()->add_export_plugin(p_editor_export);
-}
-void EditorPlugin::remove_export_plugin(const Ref<EditorExportPlugin>& p_editor_export){
-
-	EditorImportExport::get_singleton()->remove_export_plugin(p_editor_export);
-
-}
-
 Control *EditorPlugin::get_base_control() {
 
 	return EditorNode::get_singleton()->get_gui_base();
@@ -378,12 +357,6 @@ void EditorPlugin::_bind_methods() {
 	ClassDB::bind_method(_MD("remove_custom_type","type"),&EditorPlugin::remove_custom_type);
 	ClassDB::bind_method(_MD("get_editor_viewport:Control"), &EditorPlugin::get_editor_viewport);
 
-	ClassDB::bind_method(_MD("add_import_plugin","plugin:EditorImportPlugin"),&EditorPlugin::add_import_plugin);
-	ClassDB::bind_method(_MD("remove_import_plugin","plugin:EditorImportPlugin"),&EditorPlugin::remove_import_plugin);
-
-	ClassDB::bind_method(_MD("add_export_plugin","plugin:EditorExportPlugin"),&EditorPlugin::add_export_plugin);
-	ClassDB::bind_method(_MD("remove_export_plugin","plugin:EditorExportPlugin"),&EditorPlugin::remove_export_plugin);
-
 	ClassDB::bind_method(_MD("get_resource_previewer:EditorResourcePreview"),&EditorPlugin::get_resource_previewer);
 	ClassDB::bind_method(_MD("get_resource_filesystem:EditorFileSystem"),&EditorPlugin::get_resource_file_system);
 
diff --git a/tools/editor/editor_plugin.h b/tools/editor/editor_plugin.h
index 928b09685..cf998dd55 100644
--- a/tools/editor/editor_plugin.h
+++ b/tools/editor/editor_plugin.h
@@ -139,12 +139,6 @@ public:
 	void make_bottom_panel_item_visible(Control *p_item);
 	void hide_bottom_panel();
 
-	void add_import_plugin(const Ref<EditorImportPlugin>& p_editor_import);
-	void remove_import_plugin(const Ref<EditorImportPlugin>& p_editor_import);
-
-	void add_export_plugin(const Ref<EditorExportPlugin>& p_editor_export);
-	void remove_export_plugin(const Ref<EditorExportPlugin>& p_editor_export);
-
 	EditorSelection* get_selection();
 	//EditorImportExport *get_import_export();
 	EditorSettings *get_editor_settings();
diff --git a/tools/editor/editor_reimport_dialog.cpp b/tools/editor/editor_reimport_dialog.cpp
index e5ae33e91..590407023 100644
--- a/tools/editor/editor_reimport_dialog.cpp
+++ b/tools/editor/editor_reimport_dialog.cpp
@@ -31,6 +31,7 @@
 #include "editor_file_system.h"
 #include "editor_node.h"
 
+#if 0
 void EditorReImportDialog::popup_reimport() {
 
 	if (EditorFileSystem::get_singleton()->is_scanning()) {
@@ -144,3 +145,4 @@ EditorReImportDialog::EditorReImportDialog() {
 	scene_must_save=false;
 
 }
+#endif
diff --git a/tools/editor/editor_reimport_dialog.h b/tools/editor/editor_reimport_dialog.h
index 68e1ca059..7379c70c5 100644
--- a/tools/editor/editor_reimport_dialog.h
+++ b/tools/editor/editor_reimport_dialog.h
@@ -29,6 +29,7 @@
 #ifndef EDITOR_REIMPORT_DIALOG_H
 #define EDITOR_REIMPORT_DIALOG_H
 
+#if 0
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tree.h"
 
@@ -49,3 +50,4 @@ public:
 };
 
 #endif // EDITOR_REIMPORT_DIALOG_H
+#endif
diff --git a/tools/editor/editor_run_native.cpp b/tools/editor/editor_run_native.cpp
index 12b7b761e..25cb41bef 100644
--- a/tools/editor/editor_run_native.cpp
+++ b/tools/editor/editor_run_native.cpp
@@ -32,7 +32,7 @@
 
 void EditorRunNative::_notification(int p_what) {
 
-
+#if 0
 	if (p_what==NOTIFICATION_ENTER_TREE) {
 
 		List<StringName> ep;
@@ -97,11 +97,12 @@ void EditorRunNative::_notification(int p_what) {
 			first=false;
 		}
 	}
-
+#endif
 }
 
 void EditorRunNative::_run_native(int p_idx,const String& p_platform) {
 
+#if 0
 	Ref<EditorExportPlatform> eep = EditorImportExport::get_singleton()->get_export_platform(p_platform);
 	ERR_FAIL_COND(eep.is_null());
 	if (p_idx == -1) {
@@ -125,6 +126,8 @@ void EditorRunNative::_run_native(int p_idx,const String& p_platform) {
 		flags|=EditorExportPlatform::EXPORT_VIEW_NAVIGATION;
 
 	eep->run(p_idx,flags);
+
+#endif
 }
 
 void EditorRunNative::_bind_methods() {
diff --git a/tools/editor/filesystem_dock.cpp b/tools/editor/filesystem_dock.cpp
index 021d5c4eb..2af565060 100644
--- a/tools/editor/filesystem_dock.cpp
+++ b/tools/editor/filesystem_dock.cpp
@@ -363,11 +363,11 @@ void FileSystemDock::_search(EditorFileSystemDirectory *p_path,List<FileInfo>* m
 				fi.import_status=0;
 			}
 			for(int j=0;j<p_path->get_source_count(i);j++) {
-				String s = EditorImportPlugin::expand_source_path(p_path->get_source_file(i,j));
+				/*String s = EditorImportPlugin::expand_source_path(p_path->get_source_file(i,j));
 				if (p_path->is_source_file_missing(i,j)) {
 					s+=" (Missing)";
 				}
-				fi.sources.push_back(s);
+				fi.sources.push_back(s);*/
 			}
 
 			matches->push_back(fi);
@@ -510,11 +510,11 @@ void FileSystemDock::_update_files(bool p_keep_selection) {
 				}
 
 				for(int j=0;j<efd->get_source_count(i);j++) {
-					String s = EditorImportPlugin::expand_source_path(efd->get_source_file(i,j));
+					/*String s = EditorImportPlugin::expand_source_path(efd->get_source_file(i,j));
 					if (efd->is_source_file_missing(i,j)) {
 						s+=" (Missing)";
 					}
-					fi.sources.push_back(s);
+					fi.sources.push_back(s);*/
 				}
 			} else {
 				fi.import_status=0;
@@ -1068,7 +1068,7 @@ void FileSystemDock::_file_option(int p_option) {
 			}
 
 			ERR_FAIL_COND(reimport.size()==0);
-
+/*
 			Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(reimport[0]);
 			ERR_FAIL_COND(!rimd.is_valid());
 			String editor=rimd->get_editor();
@@ -1086,6 +1086,7 @@ void FileSystemDock::_file_option(int p_option) {
 				rimp->reimport_multiple_files(reimport);
 
 			}
+			*/
 
 		} break;
 		case FILE_COPY_PATH:
@@ -1542,6 +1543,7 @@ void FileSystemDock::_files_list_rmb_select(int p_item,const Vector2& p_pos) {
 
 
 			} else {
+				/*
 				Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(path);
 				if (rimd.is_valid()) {
 
@@ -1554,7 +1556,7 @@ void FileSystemDock::_files_list_rmb_select(int p_item,const Vector2& p_pos) {
 				} else {
 					all_can_reimport=false;
 
-				}
+				}*/
 			}
 		} else {
 			all_can_reimport=false;
@@ -1603,7 +1605,7 @@ void FileSystemDock::_files_list_rmb_select(int p_item,const Vector2& p_pos) {
 
 	if (all_can_reimport && types.size()==1) { //all can reimport and are of the same type
 
-
+/*
 		bool valid=true;
 		Ref<EditorImportPlugin> rimp = EditorImportExport::get_singleton()->get_import_plugin_by_name(types.front()->get());
 		if (rimp.is_valid()) {
@@ -1619,6 +1621,7 @@ void FileSystemDock::_files_list_rmb_select(int p_item,const Vector2& p_pos) {
 			file_options->add_separator();
 			file_options->add_item(TTR("Re-Import.."),FILE_REIMPORT);
 		}
+		*/
 	}
 
 	file_options->set_pos(files->get_global_pos() + p_pos);
diff --git a/tools/editor/io_plugins/editor_bitmask_import_plugin.cpp b/tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
index 222a9d951..587353fef 100644
--- a/tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_bitmask_import_plugin.cpp
@@ -27,7 +27,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "editor_bitmask_import_plugin.h"
-
+#if 0
 #include "io/image_loader.h"
 #include "tools/editor/editor_file_dialog.h"
 #include "tools/editor/editor_dir_dialog.h"
@@ -384,3 +384,4 @@ EditorBitMaskImportPlugin::EditorBitMaskImportPlugin(EditorNode* p_editor) {
 EditorBitMaskExportPlugin::EditorBitMaskExportPlugin() {
 
 }
+#endif
diff --git a/tools/editor/io_plugins/editor_bitmask_import_plugin.h b/tools/editor/io_plugins/editor_bitmask_import_plugin.h
index 3a6aababe..89ff58ec9 100644
--- a/tools/editor/io_plugins/editor_bitmask_import_plugin.h
+++ b/tools/editor/io_plugins/editor_bitmask_import_plugin.h
@@ -28,7 +28,7 @@
 /*************************************************************************/
 #ifndef EDITOR_BITMASK_IMPORT_PLUGIN_H
 #define EDITOR_BITMASK_IMPORT_PLUGIN_H
-
+#if 0
 #include "tools/editor/editor_import_export.h"
 #include "scene/resources/font.h"
 
@@ -66,4 +66,5 @@ public:
 	EditorBitMaskExportPlugin();
 };
 
+#endif
 #endif // EDITOR_SAMPLE_IMPORT_PLUGIN_H
diff --git a/tools/editor/io_plugins/editor_export_scene.cpp b/tools/editor/io_plugins/editor_export_scene.cpp
index 7d1925841..f4ab9880f 100644
--- a/tools/editor/io_plugins/editor_export_scene.cpp
+++ b/tools/editor/io_plugins/editor_export_scene.cpp
@@ -27,7 +27,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "editor_export_scene.h"
-
+#if 0
 #include "io/resource_loader.h"
 #include "io/resource_saver.h"
 #include "os/dir_access.h"
@@ -139,3 +139,4 @@ Vector<uint8_t> EditorSceneExportPlugin::custom_export(String& p_path,const Ref<
 EditorSceneExportPlugin::EditorSceneExportPlugin()
 {
 }
+#endif
diff --git a/tools/editor/io_plugins/editor_export_scene.h b/tools/editor/io_plugins/editor_export_scene.h
index 13493220c..191029bd8 100644
--- a/tools/editor/io_plugins/editor_export_scene.h
+++ b/tools/editor/io_plugins/editor_export_scene.h
@@ -31,7 +31,7 @@
 
 #include "tools/editor/editor_import_export.h"
 
-
+#if 0
 class EditorSceneExportPlugin : public EditorExportPlugin {
 	GDCLASS( EditorSceneExportPlugin, EditorExportPlugin );
 public:
@@ -40,5 +40,5 @@ public:
 
 	EditorSceneExportPlugin();
 };
-
+#endif
 #endif // EDITOR_EXPORT_SCENE_H
diff --git a/tools/editor/io_plugins/editor_font_import_plugin.cpp b/tools/editor/io_plugins/editor_font_import_plugin.cpp
index 0deb5cbbf..417aad0db 100644
--- a/tools/editor/io_plugins/editor_font_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_font_import_plugin.cpp
@@ -27,7 +27,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "editor_font_import_plugin.h"
-
+#if 0
 #include "scene/gui/dialogs.h"
 #include "tools/editor/editor_file_dialog.h"
 #include "tools/editor/editor_node.h"
@@ -1701,3 +1701,4 @@ EditorFontImportPlugin::EditorFontImportPlugin(EditorNode* p_editor) {
 	dialog = memnew( EditorFontImportDialog(this) );
 	p_editor->get_gui_base()->add_child(dialog);
 }
+#endif
diff --git a/tools/editor/io_plugins/editor_font_import_plugin.h b/tools/editor/io_plugins/editor_font_import_plugin.h
index 73c699c09..a5b265736 100644
--- a/tools/editor/io_plugins/editor_font_import_plugin.h
+++ b/tools/editor/io_plugins/editor_font_import_plugin.h
@@ -31,7 +31,7 @@
 
 #include "tools/editor/editor_import_export.h"
 #include "scene/resources/font.h"
-
+#if 0
 class EditorNode;
 class EditorFontImportDialog;
 
@@ -55,3 +55,4 @@ public:
 };
 
 #endif // EDITOR_FONT_IMPORT_PLUGIN_H
+#endif
diff --git a/tools/editor/io_plugins/editor_import_collada.cpp b/tools/editor/io_plugins/editor_import_collada.cpp
index a910b9c3a..963347f18 100644
--- a/tools/editor/io_plugins/editor_import_collada.cpp
+++ b/tools/editor/io_plugins/editor_import_collada.cpp
@@ -28,6 +28,7 @@
 /*************************************************************************/
 #include "editor_import_collada.h"
 
+#if 0
 #include "collada/collada.h"
 #include "scene/3d/spatial.h"
 #include "scene/3d/skeleton.h"
@@ -2464,3 +2465,4 @@ EditorSceneImporterCollada::EditorSceneImporterCollada() {
 
 
 }
+#endif
diff --git a/tools/editor/io_plugins/editor_import_collada.h b/tools/editor/io_plugins/editor_import_collada.h
index f6642778e..c325b58e3 100644
--- a/tools/editor/io_plugins/editor_import_collada.h
+++ b/tools/editor/io_plugins/editor_import_collada.h
@@ -31,7 +31,7 @@
 
 #include "tools/editor/io_plugins/editor_scene_import_plugin.h"
 
-
+#if 0
 
 class EditorSceneImporterCollada : public EditorSceneImporter {
 
@@ -46,6 +46,6 @@ public:
 	EditorSceneImporterCollada();
 };
 
-
+#endif
 #endif
 
diff --git a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
index d07a21fc7..fc3f8fd8c 100644
--- a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
@@ -28,6 +28,8 @@
 /*************************************************************************/
 #include "editor_mesh_import_plugin.h"
 
+#if 0
+
 #include "tools/editor/editor_file_dialog.h"
 #include "tools/editor/editor_dir_dialog.h"
 #include "tools/editor/editor_node.h"
@@ -588,3 +590,4 @@ EditorMeshImportPlugin::EditorMeshImportPlugin(EditorNode* p_editor) {
 	dialog = memnew( EditorMeshImportDialog(this));
 	p_editor->get_gui_base()->add_child(dialog);
 }
+#endif
diff --git a/tools/editor/io_plugins/editor_mesh_import_plugin.h b/tools/editor/io_plugins/editor_mesh_import_plugin.h
index 1f15fee3a..ba8ec5819 100644
--- a/tools/editor/io_plugins/editor_mesh_import_plugin.h
+++ b/tools/editor/io_plugins/editor_mesh_import_plugin.h
@@ -29,7 +29,7 @@
 #ifndef EDITOR_MESH_IMPORT_PLUGIN_H
 #define EDITOR_MESH_IMPORT_PLUGIN_H
 
-
+#if 0
 #include "tools/editor/editor_import_export.h"
 #include "scene/resources/font.h"
 
@@ -55,4 +55,5 @@ public:
 	EditorMeshImportPlugin(EditorNode* p_editor);
 };
 
+#endif
 #endif // EDITOR_MESH_IMPORT_PLUGIN_H
diff --git a/tools/editor/io_plugins/editor_scene_import_plugin.cpp b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
index ce6c49fcb..bffccb907 100644
--- a/tools/editor/io_plugins/editor_scene_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -27,7 +27,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "editor_scene_import_plugin.h"
-
+#if 0
 #include "globals.h"
 #include "tools/editor/editor_node.h"
 #include "scene/resources/packed_scene.h"
@@ -2989,3 +2989,4 @@ EditorSceneAnimationImportPlugin::EditorSceneAnimationImportPlugin(EditorNode* p
 
 
 }
+#endif
diff --git a/tools/editor/io_plugins/editor_scene_import_plugin.h b/tools/editor/io_plugins/editor_scene_import_plugin.h
index 61153e365..bbafc126b 100644
--- a/tools/editor/io_plugins/editor_scene_import_plugin.h
+++ b/tools/editor/io_plugins/editor_scene_import_plugin.h
@@ -28,7 +28,7 @@
 /*************************************************************************/
 #ifndef EDITOR_SCENE_IMPORT_PLUGIN_H
 #define EDITOR_SCENE_IMPORT_PLUGIN_H
-
+#if 0
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tree.h"
 #include "scene/gui/label.h"
@@ -196,5 +196,5 @@ public:
 
 };
 
-
+#endif
 #endif // EDITOR_SCENE_IMPORT_PLUGIN_H
diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.cpp b/tools/editor/io_plugins/editor_texture_import_plugin.cpp
index 8e1bcb8e4..c41199f29 100644
--- a/tools/editor/io_plugins/editor_texture_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_texture_import_plugin.cpp
@@ -27,7 +27,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "editor_texture_import_plugin.h"
-
+#if 0
 #include "io/image_loader.h"
 #include "tools/editor/editor_node.h"
 #include "io/resource_saver.h"
@@ -1890,3 +1890,4 @@ EditorTextureExportPlugin::EditorTextureExportPlugin() {
 
 
 }
+#endif
diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.h b/tools/editor/io_plugins/editor_texture_import_plugin.h
index b2117f147..08e0db5d6 100644
--- a/tools/editor/io_plugins/editor_texture_import_plugin.h
+++ b/tools/editor/io_plugins/editor_texture_import_plugin.h
@@ -29,6 +29,7 @@
 #ifndef EDITOR_TEXTURE_IMPORT_PLUGIN_H
 #define EDITOR_TEXTURE_IMPORT_PLUGIN_H
 
+#if 0
 #include "tools/editor/editor_import_export.h"
 #include "scene/gui/dialogs.h"
 #include "scene/gui/tree.h"
@@ -170,3 +171,4 @@ public:
 
 };
 #endif // EDITOR_TEXTURE_IMPORT_PLUGIN_H
+#endif
diff --git a/tools/editor/io_plugins/editor_translation_import_plugin.cpp b/tools/editor/io_plugins/editor_translation_import_plugin.cpp
index 7079120fe..9438af907 100644
--- a/tools/editor/io_plugins/editor_translation_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_translation_import_plugin.cpp
@@ -28,6 +28,7 @@
 /*************************************************************************/
 #include "editor_translation_import_plugin.h"
 
+#if 0
 #include "scene/gui/file_dialog.h"
 #include "tools/editor/editor_dir_dialog.h"
 #include "tools/editor/editor_node.h"
@@ -474,3 +475,5 @@ EditorTranslationImportPlugin::EditorTranslationImportPlugin(EditorNode* p_edito
 	dialog = memnew(EditorTranslationImportDialog(this));
 	p_editor->get_gui_base()->add_child(dialog);
 }
+
+#endif
diff --git a/tools/editor/io_plugins/editor_translation_import_plugin.h b/tools/editor/io_plugins/editor_translation_import_plugin.h
index 38727bd77..4884ea71c 100644
--- a/tools/editor/io_plugins/editor_translation_import_plugin.h
+++ b/tools/editor/io_plugins/editor_translation_import_plugin.h
@@ -31,7 +31,7 @@
 
 #include "tools/editor/editor_import_export.h"
 #include "scene/resources/font.h"
-
+#if 0
 class EditorNode;
 class EditorTranslationImportDialog;
 
@@ -52,4 +52,5 @@ public:
 	EditorTranslationImportPlugin(EditorNode* p_editor);
 };
 
+#endif
 #endif // EDITOR_TRANSLATION_IMPORT_PLUGIN_H
diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp
index cacefaa1a..4472cff9c 100644
--- a/tools/editor/project_export.cpp
+++ b/tools/editor/project_export.cpp
@@ -27,7 +27,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "project_export.h"
-
+#if 0
 #include "os/dir_access.h"
 #include "os/file_access.h"
 #include "globals.h"
@@ -2127,3 +2127,4 @@ ProjectExport::ProjectExport(EditorData* p_data) {
 
 
 }
+#endif
diff --git a/tools/editor/project_export.h b/tools/editor/project_export.h
index 06992a7e3..c528a2312 100644
--- a/tools/editor/project_export.h
+++ b/tools/editor/project_export.h
@@ -46,6 +46,7 @@
 #include "property_editor.h"
 #include "editor_import_export.h"
 
+#if 0
 class EditorNode;
 
 class ProjectExportDialog : public ConfirmationDialog {
@@ -242,3 +243,4 @@ public:
 
 
 #endif // PROJECT_EXPORT_SETTINGS_H
+#endif
diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp
index 15d03b8a2..764d1e454 100644
--- a/tools/editor/project_settings.cpp
+++ b/tools/editor/project_settings.cpp
@@ -1342,7 +1342,7 @@ ProjectSettings::ProjectSettings(EditorData *p_data) {
 
 	hbc->add_spacer();
 
-	List<StringName> ep;
+	/*List<StringName> ep;
 	EditorImportExport::get_singleton()->get_export_platforms(&ep);
 	ep.sort_custom<StringName::AlphCompare>();
 
@@ -1350,7 +1350,7 @@ ProjectSettings::ProjectSettings(EditorData *p_data) {
 
 		popup_platform->get_popup()->add_item( E->get() );
 
-	}
+	}*/
 
 	popup_platform->get_popup()->connect("id_pressed",this,"_copy_to_platform");
 	get_ok()->set_text(TTR("Close"));
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp
index e5dce0524..19720dfd6 100644
--- a/tools/editor/property_editor.cpp
+++ b/tools/editor/property_editor.cpp
@@ -208,13 +208,13 @@ void CustomPropertyEditor::_menu_option(int p_which) {
 				case OBJ_MENU_REIMPORT: {
 
 					RES r=v;
-					if (r.is_valid() && r->get_import_metadata().is_valid()) {
+/*					if (r.is_valid() && r->get_import_metadata().is_valid()) {
 						Ref<ResourceImportMetadata> rimd = r->get_import_metadata();
 						Ref<EditorImportPlugin> eip = EditorImportExport::get_singleton()->get_import_plugin_by_name(rimd->get_editor());
 						if (eip.is_valid()) {
 							eip->import_dialog(r->get_path());
 						}
-					}
+					}*/
 				} break;
 				case OBJ_MENU_NEW_SCRIPT: {
 
@@ -945,11 +945,11 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 				menu->add_icon_item(get_icon("EditResource","EditorIcons"),"Edit",OBJ_MENU_EDIT);
 				menu->add_icon_item(get_icon("Del","EditorIcons"),"Clear",OBJ_MENU_CLEAR);
 				menu->add_icon_item(get_icon("Duplicate","EditorIcons"),"Make Unique",OBJ_MENU_MAKE_UNIQUE);
-				RES r = v;
+				/*RES r = v;
 				if (r.is_valid() && r->get_path().is_resource_file() && r->get_import_metadata().is_valid()) {
 					menu->add_separator();
 					menu->add_icon_item(get_icon("ReloadSmall","EditorIcons"),"Re-Import",OBJ_MENU_REIMPORT);
-				}
+				}*/
 				/*if (r.is_valid() && r->get_path().is_resource_file()) {
 					menu->set_item_tooltip(1,r->get_path());
 				} else if (r.is_valid()) {