From 9ea7427ce7cbc5bde3b58c83b0d468bb412dcd97 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Mon, 7 Feb 2022 13:21:11 +0100 Subject: [PATCH] Fix for #7887 - [UI] Add Settings > Layers and Perimeters - some options have non distinct labels + Fixed build warning --- src/slic3r/GUI/GUI_ObjectSettings.cpp | 2 ++ src/slic3r/GUI/Plater.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/GUI_ObjectSettings.cpp b/src/slic3r/GUI/GUI_ObjectSettings.cpp index c9a7cd3306..291013fe9d 100644 --- a/src/slic3r/GUI/GUI_ObjectSettings.cpp +++ b/src/slic3r/GUI/GUI_ObjectSettings.cpp @@ -141,6 +141,8 @@ bool ObjectSettings::update_settings_list() { Option option = optgroup->get_option(opt); option.opt.width = 12; + if (!option.opt.full_label.empty()) + option.opt.label = option.opt.full_label; if (is_extruders_cat) option.opt.max = wxGetApp().extruders_edited_cnt(); optgroup->append_single_option_line(option); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 90b67432b0..d30d9ad888 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2409,7 +2409,7 @@ std::vector Plater::priv::load_files(const std::vector& input_ try { if (type_3mf || type_zip_amf) { DynamicPrintConfig config; - PrinterTechnology loaded_printer_technology; + PrinterTechnology loaded_printer_technology {ptFFF}; { DynamicPrintConfig config_loaded; ConfigSubstitutionContext config_substitutions{ ForwardCompatibilitySubstitutionRule::Enable };