summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-02-28 10:13:22 +0100
committerGitHub <noreply@github.com>2020-02-28 10:13:22 +0100
commit42ffcaa4f756115d26f7f1d9fd1ba5b13b7bf1e8 (patch)
tree20659584c9bfb624d8225f0d743f43a080b77ef1 /editor
parent5a025d3ce80dfd4e702ca81084f802b4e861a8fb (diff)
parentd35386263fcd5e0f92b2e676e3692ff3091dc2df (diff)
Merge pull request #36630 from YeldhamDev/import_dock_checking_preset
Fix import changing disabling checking on multiple files
Diffstat (limited to 'editor')
-rw-r--r--editor/import_dock.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp
index 06c6f9940c..ec37e49ee6 100644
--- a/editor/import_dock.cpp
+++ b/editor/import_dock.cpp
@@ -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()) {