From eb5e5200cc2a21f69da2b14c5dd05a3cdd994928 Mon Sep 17 00:00:00 2001 From: George Marques Date: Sun, 18 Feb 2018 16:23:45 -0300 Subject: [PATCH] Fix infinite recursion with editor import plugins (cherry picked from commit 95f7879923783c3cbfc0a42cfd11e2b9d8260b46) --- editor/import/editor_import_plugin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editor/import/editor_import_plugin.cpp b/editor/import/editor_import_plugin.cpp index 3f5dc7c9f40..c1c11836926 100644 --- a/editor/import/editor_import_plugin.cpp +++ b/editor/import/editor_import_plugin.cpp @@ -74,14 +74,14 @@ String EditorImportPlugin::get_resource_type() const { float EditorImportPlugin::get_priority() const { if (!(get_script_instance() && get_script_instance()->has_method("get_priority"))) { - return EditorImportPlugin::get_priority(); + return ResourceImporter::get_priority(); } return get_script_instance()->call("get_priority"); } int EditorImportPlugin::get_import_order() const { if (!(get_script_instance() && get_script_instance()->has_method("get_import_order"))) { - return EditorImportPlugin::get_import_order(); + return ResourceImporter::get_import_order(); } return get_script_instance()->call("get_import_order"); }