Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuSanka <yusanka@gmail.com>2021-12-14 13:49:53 +0300
committerYuSanka <yusanka@gmail.com>2021-12-14 13:49:53 +0300
commit8b3e4136338c5e758ed0f0d4ccbb66fb5e4a911f (patch)
tree679b556d43cfa880fb6803c681c9f1148501f0f6
parent5243abcece55edfdcdeb7866e15562f9e51c9690 (diff)
Follow-up e2475c95 - Disable check of the compatibility of the "support_material" and "overhangs" options for profile which was loaded from 3mf
-rw-r--r--src/slic3r/GUI/Tab.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index f5fb4f82c..417ab60fa 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -1769,11 +1769,14 @@ void TabPrint::update()
// Note: This workaround works till "support_material" and "overhangs" is exclusive sets of mutually no-exclusive parameters.
// But it should be corrected when we will have more such sets.
// Disable check of the compatibility of the "support_material" and "overhangs" options for saved user profile
- if (!m_config_manipulation.is_initialized_support_material_overhangs_queried()) {
+ // or for profile which was loaded from 3mf
+// if (!m_config_manipulation.is_initialized_support_material_overhangs_queried())
+ if (bool support_material_overhangs_queried = m_config->opt_bool("support_material") && !m_config->opt_bool("overhangs"))
+ {
const Preset& selected_preset = m_preset_bundle->prints.get_selected_preset();
bool is_user_and_saved_preset = !selected_preset.is_system && !selected_preset.is_dirty;
- bool support_material_overhangs_queried = m_config->opt_bool("support_material") && !m_config->opt_bool("overhangs");
- m_config_manipulation.initialize_support_material_overhangs_queried(is_user_and_saved_preset && support_material_overhangs_queried);
+ bool is_saved_in_3mf_preset = selected_preset.is_dirty && !wxGetApp().plater()->is_presets_dirty();
+ m_config_manipulation.initialize_support_material_overhangs_queried((is_user_and_saved_preset || is_saved_in_3mf_preset) && support_material_overhangs_queried);
}
m_config_manipulation.update_print_fff_config(m_config, true);