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

Merge pull request #36630 from YeldhamDev/import_dock_checking_preset 

Fix import changing disabling checking on multiple files
This commit is contained in:
Rémi Verschelde 2020-02-28 10:13:22 +01:00 committed by GitHub
parent 5a025d3ce8 d35386263f
commit 42ffcaa4f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/import_dock.cpp
View File

@ -107,6 +107,9 @@ void ImportDock::set_edit_path(const String &p_path) {
return;
}
params->paths.clear();
params->paths.push_back(p_path);
_update_options(config);
List<Ref<ResourceImporter> > importers;
@ -129,8 +132,6 @@ void ImportDock::set_edit_path(const String &p_path) {
}
}
params->paths.clear();
params->paths.push_back(p_path);
import->set_disabled(false);
import_as->set_disabled(false);
preset->set_disabled(false);
@ -145,7 +146,7 @@ void ImportDock::_update_options(const Ref<ConfigFile> &p_config) {
params->properties.clear();
params->values.clear();
params->checking = false;
params->checking = params->paths.size() > 1;
params->checked.clear();
for (List<ResourceImporter::ImportOption>::Element *E = options.front(); E; E = E->next()) {