godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix infinite recursion with editor import plugins 

(cherry picked from commit 95f7879923)
This commit is contained in:
George Marques 2018-02-18 16:23:45 -03:00 committed by Hein-Pieter van Braam
parent d54ac732ae
commit eb5e5200cc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/import/editor_import_plugin.cpp
View File

@ -74,14 +74,14 @@ String EditorImportPlugin::get_resource_type() const {
float EditorImportPlugin::get_priority() const { float EditorImportPlugin::get_priority() const {
if (!(get_script_instance() && get_script_instance()->has_method("get_priority"))) { 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"); return get_script_instance()->call("get_priority");
} }
int EditorImportPlugin::get_import_order() const { int EditorImportPlugin::get_import_order() const {
if (!(get_script_instance() && get_script_instance()->has_method("get_import_order"))) { 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"); return get_script_instance()->call("get_import_order");
} }