juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-26 04:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into dev/p2s-pr

Browse Source
This commit is contained in:
Noisyfox
2025-11-07 10:42:06 +08:00
parent 55f677ef21 e8464dd69c
commit 0115cfbdd0
7 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/AMSMaterialsSetting.cpp
View File

@@ -858,7 +858,7 @@ static void _collect_filament_info(const wxString& shown_name,
unordered_map<wxString, wxString>& query_filament_types)
{
query_filament_vendors[shown_name] = filament.config.get_filament_vendor();
query_filament_vendors[shown_name] = filament.config.get_filament_type();
query_filament_types[shown_name] = filament.config.get_filament_type();
}
void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_min, wxString temp_max, wxString k, wxString n)

2
src/slic3r/GUI/ConfigManipulation.cpp
View File

@@ -789,7 +789,7 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co
toggle_field(el, have_support_material && !(support_is_normal_tree && !have_raft));
bool has_ironing = (config->opt_enum<IroningType>("ironing_type") != IroningType::NoIroning);
for (auto el : { "ironing_pattern", "ironing_flow", "ironing_spacing", "ironing_angle", "ironing_inset"})
for (auto el : { "ironing_pattern", "ironing_flow", "ironing_spacing", "ironing_angle", "ironing_inset", "ironing_angle_fixed" })
toggle_line(el, has_ironing);
toggle_line("ironing_speed", has_ironing || has_support_ironing);