summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-04-06 08:55:16 +0200
committerGitHub <noreply@github.com>2020-04-06 08:55:16 +0200
commit1140871f7e5b627bcd5c11e073975ed21421a95c (patch)
treecc0602b8f2d6672c6e799a25314c05eb0372891c /editor
parent94fab213482fd944debc50e255e7b395d391cc33 (diff)
parent6d6af0ea06b4a3dbea31c530a283430f88ecf4c9 (diff)
Merge pull request #37610 from YeldhamDev/multifile_import_change_fix
Fix changing the import type of multiple files at once
Diffstat (limited to 'editor')
-rw-r--r--editor/import_dock.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp
index 23be42aaea..22f6aedeaa 100644
--- a/editor/import_dock.cpp
+++ b/editor/import_dock.cpp
@@ -450,8 +450,8 @@ void ImportDock::_reimport() {
String importer_name = params->importer->get_importer_name();
- if (params->checking) {
- //update only what edited (checkboxes)
+ if (params->checking && config->get_value("remap", "importer") == params->importer->get_importer_name()) {
+ //update only what is edited (checkboxes) if the importer is the same
for (List<PropertyInfo>::Element *E = params->properties.front(); E; E = E->next()) {
if (params->checked.has(E->get().name)) {
config->set_value("params", E->get().name, params->values[E->get().name]);
@@ -558,7 +558,7 @@ ImportDock::ImportDock() {
hb->add_spacer();
reimport_confirm = memnew(ConfirmationDialog);
- reimport_confirm->get_ok()->set_text(TTR("Save scenes, re-import and restart"));
+ reimport_confirm->get_ok()->set_text(TTR("Save Scenes, Re-Import, and Restart"));
add_child(reimport_confirm);
reimport_confirm->connect("confirmed", callable_mp(this, &ImportDock::_reimport_and_restart));