asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #92815 from aaronp64/keep_skip_import_crash

Browse source 
Fix Keep/Skip File import selection crash
This commit is contained in:
Rémi Verschelde 2024-06-10 16:40:53 +02:00
commit 91e166a0c0
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
editor/import_dock.cpp
View file

@ -189,6 +189,7 @@ void ImportDock::_update_options(const String &p_path, const Ref<ConfigFile> &p_
params->base_options_path = p_path; params->base_options_path = p_path;
HashMap<StringName, Variant> import_options; HashMap<StringName, Variant> import_options;
if (p_config.is_valid() && p_config->has_section("params")) {
List<String> section_keys; List<String> section_keys;
p_config->get_section_keys("params", &section_keys); p_config->get_section_keys("params", &section_keys);
for (const String &section_key : section_keys) { for (const String &section_key : section_keys) {
@ -197,6 +198,7 @@ void ImportDock::_update_options(const String &p_path, const Ref<ConfigFile> &p_
if (params->importer.is_valid()) { if (params->importer.is_valid()) {
params->importer->handle_compatibility_options(import_options); params->importer->handle_compatibility_options(import_options);
} }
}
for (const ResourceImporter::ImportOption &E : options) { for (const ResourceImporter::ImportOption &E : options) {
params->properties.push_back(E.option); params->properties.push_back(E.option);