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

FIX: fix a cherry-pick conflict error 

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ib8cc0598ec07fd204c3629206fb09939b7501215
This commit is contained in:
yifan.wu 2022-11-29 21:06:25 +08:00 committed by Lane.Wei
parent 2ecb2fd22d
commit 3b0f75bd4e
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libslic3r/Preset.cpp
View File

@ -661,8 +661,6 @@ std::string Preset::get_printer_type(PresetBundle *preset_bundle)
return ""; return "";
} }
<<<<<<< HEAD (8eb681 FIX: fix use ams always checked)
=======
std::string Preset::get_current_printer_type(PresetBundle *preset_bundle) std::string Preset::get_current_printer_type(PresetBundle *preset_bundle)
{ {
if (preset_bundle) { if (preset_bundle) {
@ -685,7 +683,6 @@ bool Preset::is_custom_defined()
return true; return true;
return false; return false;
} }
>>>>>>> CHANGE (84edf0 FIX: the P1P printer is not support smooth timelapse)
bool Preset::is_bbl_vendor_preset(PresetBundle *preset_bundle) bool Preset::is_bbl_vendor_preset(PresetBundle *preset_bundle)
{ {
@ -707,13 +704,6 @@ bool Preset::is_bbl_vendor_preset(PresetBundle *preset_bundle)
return is_bbl_vendor_preset; return is_bbl_vendor_preset;
} }
bool Preset::is_custom_defined()
{
if (custom_defined == "1")
return true;
return false;
}
static std::vector<std::string> s_Preset_print_options { static std::vector<std::string> s_Preset_print_options {
"layer_height", "initial_layer_print_height", "wall_loops", "slice_closing_radius", "spiral_mode", "slicing_mode", "layer_height", "initial_layer_print_height", "wall_loops", "slice_closing_radius", "spiral_mode", "slicing_mode",
"top_shell_layers", "top_shell_thickness", "bottom_shell_layers", "bottom_shell_thickness", "top_shell_layers", "top_shell_thickness", "bottom_shell_layers", "bottom_shell_thickness",