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

Revert "Fix EditorExportPlugin::_export_file() ignoring GDScripts"

Browse Source 
This reverts commit 9504b0ff7a.

This broke exporting C# projects to Android in debug builds.

- Fixes #112918.
- Fixes #112397.
This commit is contained in:
Rémi Verschelde
2025-11-25 14:46:05 +01:00
parent 22a28e07cc
commit 7722d52d51
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
editor/export/editor_export_platform.cpp
View File

@ -1339,8 +1339,6 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
}
bool do_export = true;
bool skip_all = false;
int skipped_i = export_plugins.size() - 1;
for (int i = 0; i < export_plugins.size(); i++) {
if (GDVIRTUAL_IS_OVERRIDDEN_PTR(export_plugins[i], _export_file)) {
export_plugins.write[i]->_export_file_script(path, type, features_psa);
@ -1356,30 +1354,26 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
}
}
if (export_plugins[i]->skipped) {
do_export = false;
skip_all = true;
skipped_i = i;
break;
}
}
for (int i = 0; i <= skipped_i; i++) {
if (!skip_all) {
for (const EditorExportPlugin::ExtraFile &extra_file : export_plugins[i]->extra_files) {
err = save_proxy.save_file(p_udata, extra_file.path, extra_file.data, idx, total, enc_in_filters, enc_ex_filters, key, seed);
for (int j = 0; j < export_plugins[i]->extra_files.size(); j++) {
err = save_proxy.save_file(p_udata, export_plugins[i]->extra_files[j].path, export_plugins[i]->extra_files[j].data, idx, total, enc_in_filters, enc_ex_filters, key, seed);
if (err != OK) {
return err;
}
if (extra_file.remap) {
if (export_plugins[i]->extra_files[j].remap) {
do_export = false; // If remap, do not.
path_remaps.push_back(path);
path_remaps.push_back(extra_file.path);
}
path_remaps.push_back(export_plugins[i]->extra_files[j].path);
}
}
if (export_plugins[i]->skipped) {
do_export = false;
}
export_plugins.write[i]->_clear();
if (!do_export) {
break;
}
}
if (!do_export) {
continue;