From 113cfdfc69171a68f62230b191c1bc61135bc395 Mon Sep 17 00:00:00 2001 From: David Snopek Date: Fri, 25 Aug 2023 10:52:30 -0500 Subject: [PATCH] Fix overriding _export_begin, _export_file and _export_end from GDExtension (cherry picked from commit d09843c5ae6bc140fdaad5c20df38a47df55e21b) --- editor/export/editor_export_platform.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/editor/export/editor_export_platform.cpp b/editor/export/editor_export_platform.cpp index d04eeafd079..ddc5548594e 100644 --- a/editor/export/editor_export_platform.cpp +++ b/editor/export/editor_export_platform.cpp @@ -497,7 +497,7 @@ EditorExportPlatform::ExportNotifier::ExportNotifier(EditorExportPlatform &p_pla //initial export plugin callback for (int i = 0; i < export_plugins.size(); i++) { export_plugins.write[i]->set_export_preset(p_preset); - if (export_plugins[i]->get_script_instance()) { //script based + if (GDVIRTUAL_IS_OVERRIDDEN_PTR(export_plugins[i], _export_begin)) { PackedStringArray features_psa; for (const String &feature : features) { features_psa.push_back(feature); @@ -512,7 +512,7 @@ EditorExportPlatform::ExportNotifier::ExportNotifier(EditorExportPlatform &p_pla EditorExportPlatform::ExportNotifier::~ExportNotifier() { Vector> export_plugins = EditorExport::get_singleton()->get_export_plugins(); for (int i = 0; i < export_plugins.size(); i++) { - if (export_plugins[i]->get_script_instance()) { + if (GDVIRTUAL_IS_OVERRIDDEN_PTR(export_plugins[i], _export_end)) { export_plugins.write[i]->_export_end_script(); } export_plugins.write[i]->_export_end(); @@ -1222,7 +1222,7 @@ Error EditorExportPlatform::export_project_files(const Ref & bool do_export = true; for (int i = 0; i < export_plugins.size(); i++) { - if (export_plugins[i]->get_script_instance()) { //script based + if (GDVIRTUAL_IS_OVERRIDDEN_PTR(export_plugins[i], _export_file)) { export_plugins.write[i]->_export_file_script(path, type, features_psa); } else { export_plugins.write[i]->_export_file(path, type, features);