diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-01 08:14:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-01 08:14:28 +0200 |
commit | 4536c608f2cb51eb2ad87159280ff312924c5192 (patch) | |
tree | 7fb47e9aaaab789286f36ff21d28dad6c8e4f5a3 | |
parent | 51ae90d7893fd392dd8938cc41c52081e5065794 (diff) | |
parent | 00a3ef44da404be1a7d75307a06ee2010679fe1b (diff) |
Merge pull request #10821 from rtroncoso/fix-import-defaults
Fix import dock "Set as default" actions
-rw-r--r-- | editor/import_dock.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp index a60f5d7294..112e3abcb5 100644 --- a/editor/import_dock.cpp +++ b/editor/import_dock.cpp @@ -265,16 +265,14 @@ void ImportDock::set_edit_multiple_paths(const Vector<String> &p_paths) { void ImportDock::_preset_selected(int p_idx) { - switch (p_idx) { - case ITEM_SET_AS_DEFAULT: { - List<ResourceImporter::ImportOption> options; - - params->importer->get_import_options(&options, p_idx); + int item_id = preset->get_popup()->get_item_id(p_idx); + switch (item_id) { + case ITEM_SET_AS_DEFAULT: { Dictionary d; - for (List<ResourceImporter::ImportOption>::Element *E = options.front(); E; E = E->next()) { - d[E->get().option.name] = E->get().default_value; + for (const List<PropertyInfo>::Element *E = params->properties.front(); E; E = E->next()) { + d[E->get().name] = params->values[E->get().name]; } ProjectSettings::get_singleton()->set("importer_defaults/" + params->importer->get_importer_name(), d); |