mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: fix the merge error 

jira: none
Change-Id: I96fcb20ad7813a7854744902f2bac0258d38e381
This commit is contained in:
zhimin.zeng 2024-12-13 14:36:18 +08:00 committed by lane.wei
parent 1e66aec1be
commit 2c0a83d256
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3430,7 +3430,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
//BBS: add bed_exclude_area
, config(Slic3r::DynamicPrintConfig::new_from_defaults_keys({
"printable_area", "bed_exclude_area", "extruder_printable_area", "bed_custom_texture", "bed_custom_model", "print_sequence",
"extruder_clearance_radius", "extruder_clearance_dist_to_rod", "extruder_clearance_max_radius",
"extruder_clearance_dist_to_rod", "extruder_clearance_max_radius",
"extruder_clearance_height_to_lid", "extruder_clearance_height_to_rod",
"nozzle_height", "skirt_loops", "skirt_distance",
"brim_width", "brim_object_gap", "brim_type", "nozzle_diameter", "single_extruder_multi_material",

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

@ -2094,7 +2094,7 @@ void TabPrint::build()
line.append_option(optgroup->get_option("overhang_3_4_speed", 0));
line.append_option(optgroup->get_option("overhang_4_4_speed", 0));
optgroup->append_line(line);
optgroup->append_single_option_line("overhang_totally_speed", 0);
optgroup->append_single_option_line("overhang_totally_speed", "", 0);
optgroup->append_single_option_line("bridge_speed", "", 0);
optgroup->append_single_option_line("gap_infill_speed", "", 0);
optgroup->append_single_option_line("support_speed", "", 0);