aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Marques2018-02-18 16:23:45 -0300
committerHein-Pieter van Braam2018-02-19 22:16:33 +0100
commiteb5e5200cc2a21f69da2b14c5dd05a3cdd994928 (patch)
tree28d58b67d92a851a3f4f25beafe6375e4af1e1de
parentd54ac732ae6643a817ea84d8adc7dd01490220e7 (diff)
downloadgodot-eb5e5200cc2a21f69da2b14c5dd05a3cdd994928.tar.gz
godot-eb5e5200cc2a21f69da2b14c5dd05a3cdd994928.tar.zst
godot-eb5e5200cc2a21f69da2b14c5dd05a3cdd994928.zip
Fix infinite recursion with editor import plugins
(cherry picked from commit 95f7879923783c3cbfc0a42cfd11e2b9d8260b46)
-rw-r--r--editor/import/editor_import_plugin.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/import/editor_import_plugin.cpp b/editor/import/editor_import_plugin.cpp
index 3f5dc7c9f..c1c118369 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");
}