From 9dcf9da205b3c7ac7648ab4e768d24784c7e7930 Mon Sep 17 00:00:00 2001 From: Michael Alexsander Date: Sun, 5 Apr 2020 15:13:29 -0300 Subject: [PATCH] Fix changing the import type of multiple files at once (cherry picked from commit 6d6af0ea06b4a3dbea31c530a283430f88ecf4c9) --- editor/import_dock.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp index 410b8193c93..7fbc8d426f1 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::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]); @@ -563,7 +563,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", this, "_reimport_and_restart");