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

Merge pull request #106532 from isaaccp/fix-texture-atlas-import-deadlock

Browse Source 
Fix texture atlas import deadlock by keeping group_file= on failed import_file() attempts
This commit is contained in:
Thaddeus Crews
2025-11-17 10:56:41 -06:00
parent 46adcc6268 31610b058b
commit d999f873ba
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/file_system/editor_file_system.cpp
View File

@ -2794,6 +2794,7 @@ Error EditorFileSystem::_reimport_file(const String &p_file, const HashMap<Strin
ResourceUID::ID uid = ResourceUID::INVALID_ID; ResourceUID::ID uid = ResourceUID::INVALID_ID;
Variant generator_parameters; Variant generator_parameters;
String group_file;
if (p_generator_parameters) { if (p_generator_parameters) {
generator_parameters = *p_generator_parameters; generator_parameters = *p_generator_parameters;
} }
@ -2823,6 +2824,10 @@ Error EditorFileSystem::_reimport_file(const String &p_file, const HashMap<Strin
uid = ResourceUID::get_singleton()->text_to_id(uidt); uid = ResourceUID::get_singleton()->text_to_id(uidt);
} }
if (cf->has_section_key("remap", "group_file")) {
group_file = cf->get_value("remap", "group_file");
}
if (!p_generator_parameters) { if (!p_generator_parameters) {
if (cf->has_section_key("remap", "generator_parameters")) { if (cf->has_section_key("remap", "generator_parameters")) {
generator_parameters = cf->get_value("remap", "generator_parameters"); generator_parameters = cf->get_value("remap", "generator_parameters");
@ -2918,6 +2923,9 @@ Error EditorFileSystem::_reimport_file(const String &p_file, const HashMap<Strin
} }
f->store_line("uid=\"" + ResourceUID::get_singleton()->id_to_text(uid) + "\""); // Store in readable format. f->store_line("uid=\"" + ResourceUID::get_singleton()->id_to_text(uid) + "\""); // Store in readable format.
if (!group_file.is_empty()) {
f->store_line("group_file=\"" + group_file + "\"");
}
if (err == OK) { if (err == OK) {
if (importer->get_save_extension().is_empty()) { if (importer->get_save_extension().is_empty()) {