From 2c0a83d256d1143a9bdf250e4fbb55f4c0d3f143 Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Fri, 13 Dec 2024 14:36:18 +0800 Subject: [PATCH] FIX: fix the merge error jira: none Change-Id: I96fcb20ad7813a7854744902f2bac0258d38e381 --- src/slic3r/GUI/Plater.cpp | 2 +- src/slic3r/GUI/Tab.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index e3c2ba384..7405e5c78 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -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", diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 12de9bd3c..053806b51 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -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);