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

Fix changing the import type of multiple files at once 

(cherry picked from commit 6d6af0ea06)
This commit is contained in:
Michael Alexsander 2020-04-05 15:13:29 -03:00 committed by Rémi Verschelde
parent d4c77e60c0
commit 9dcf9da205
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/import_dock.cpp
View File

@ -450,8 +450,8 @@ void ImportDock::_reimport() {
String importer_name = params->importer->get_importer_name(); String importer_name = params->importer->get_importer_name();
if (params->checking) { if (params->checking && config->get_value("remap", "importer") == params->importer->get_importer_name()) {
//update only what edited (checkboxes) //update only what is edited (checkboxes) if the importer is the same
for (List<PropertyInfo>::Element *E = params->properties.front(); E; E = E->next()) { for (List<PropertyInfo>::Element *E = params->properties.front(); E; E = E->next()) {
if (params->checked.has(E->get().name)) { if (params->checked.has(E->get().name)) {
config->set_value("params", E->get().name, params->values[E->get().name]); config->set_value("params", E->get().name, params->values[E->get().name]);
@ -563,7 +563,7 @@ ImportDock::ImportDock() {
hb->add_spacer(); hb->add_spacer();
reimport_confirm = memnew(ConfirmationDialog); 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); add_child(reimport_confirm);
reimport_confirm->connect("confirmed", this, "_reimport_and_restart"); reimport_confirm->connect("confirmed", this, "_reimport_and_restart");