diff options
author | Enrico Turri <enricoturri@seznam.cz> | 2018-06-06 13:18:52 +0300 |
---|---|---|
committer | Enrico Turri <enricoturri@seznam.cz> | 2018-06-06 13:18:52 +0300 |
commit | 2dee4d1a83070f824d66cda7cc375c6db546c7d9 (patch) | |
tree | 942b3acac08589c56a21e0650debef0118f478e3 /xs | |
parent | c6e44509e09f0fac77ef3a50d302bc2bc192c00e (diff) | |
parent | 92875709e1881fe3f374cd06321dacc3edbbd4c6 (diff) |
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
Diffstat (limited to 'xs')
-rw-r--r-- | xs/src/slic3r/GUI/PresetBundle.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/xs/src/slic3r/GUI/PresetBundle.cpp b/xs/src/slic3r/GUI/PresetBundle.cpp index 1427e5086..98d351069 100644 --- a/xs/src/slic3r/GUI/PresetBundle.cpp +++ b/xs/src/slic3r/GUI/PresetBundle.cpp @@ -840,17 +840,13 @@ size_t PresetBundle::load_configbundle(const std::string &path, unsigned int fla // Load the print, filament or printer preset. const DynamicPrintConfig &default_config = presets->default_preset().config; DynamicPrintConfig config(default_config); - std::vector<std::string> config_keys = config.keys(); - // The following two keys are valid, but they are not mandatory. - config_keys.emplace_back("compatible_printers"); - config_keys.emplace_back("compatible_printers_condition"); for (auto &kvp : section.second) config.set_deserialize(kvp.first, kvp.second.data()); Preset::normalize(config); // Report configuration fields, which are misplaced into a wrong group. std::string incorrect_keys; size_t n_incorrect_keys = 0; - for (const std::string &key : config_keys) + for (const std::string &key : config.keys()) if (! default_config.has(key)) { if (incorrect_keys.empty()) incorrect_keys = key; |