Revert of the 8b3e413633, which was caused the issue #7498

This commit is contained in:
YuSanka 2021-12-15 09:03:38 +01:00
parent caff954aa7
commit 322583bc78

View File

@ -1769,14 +1769,13 @@ void TabPrint::update()
// Note: This workaround works till "support_material" and "overhangs" is exclusive sets of mutually no-exclusive parameters. // 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. // 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 // Disable check of the compatibility of the "support_material" and "overhangs" options for saved user profile
// or for profile which was loaded from 3mf // NOTE: Initialization of the support_material_overhangs_queried value have to be processed just ones
// if (!m_config_manipulation.is_initialized_support_material_overhangs_queried()) 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(); 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 is_user_and_saved_preset = !selected_preset.is_system && !selected_preset.is_dirty;
bool is_saved_in_3mf_preset = selected_preset.is_dirty && !wxGetApp().plater()->is_presets_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 || is_saved_in_3mf_preset) && support_material_overhangs_queried); m_config_manipulation.initialize_support_material_overhangs_queried(is_user_and_saved_preset && support_material_overhangs_queried);
} }
m_config_manipulation.update_print_fff_config(m_config, true); m_config_manipulation.update_print_fff_config(m_config, true);