From 59311903482722d015d05a1ce09c0eeefa9212f3 Mon Sep 17 00:00:00 2001 From: George Marques Date: Sat, 9 Dec 2017 14:59:01 -0200 Subject: [PATCH] Defer the scan filesystem call when adding import plugins This ensures every plugin is added before the scan is made. Fix #12749 --- editor/editor_plugin.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index a39e4d6efb8..5c4c2b694fa 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -565,12 +565,12 @@ void EditorPlugin::save_global_state() {} void EditorPlugin::add_import_plugin(const Ref &p_importer) { ResourceFormatImporter::get_singleton()->add_importer(p_importer); - EditorFileSystem::get_singleton()->scan(); + EditorFileSystem::get_singleton()->call_deferred("scan"); } void EditorPlugin::remove_import_plugin(const Ref &p_importer) { ResourceFormatImporter::get_singleton()->remove_importer(p_importer); - EditorFileSystem::get_singleton()->scan(); + EditorFileSystem::get_singleton()->call_deferred("scan"); } void EditorPlugin::add_export_plugin(const Ref &p_exporter) { @@ -587,7 +587,6 @@ void EditorPlugin::add_scene_import_plugin(const Ref &p_imp void EditorPlugin::remove_scene_import_plugin(const Ref &p_importer) { ResourceImporterScene::get_singleton()->remove_importer(p_importer); - } void EditorPlugin::set_window_layout(Ref p_layout) {