diff --git a/src/libslic3r/Brim.cpp b/src/libslic3r/Brim.cpp index a2e0373976..711e8f8e45 100644 --- a/src/libslic3r/Brim.cpp +++ b/src/libslic3r/Brim.cpp @@ -952,8 +952,6 @@ static ExPolygons outer_inner_brim_area(const Print& print, // BBS: inner and outer boundary are offset from the same polygon incase of round off error. auto innerExpoly = offset_ex(ex_poly.contour, brim_offset, jtRound, SCALED_RESOLUTION); append(brim_area_object, diff_ex(offset_ex(innerExpoly, brim_width_mod, jtRound, SCALED_RESOLUTION), innerExpoly)); - // BBS: brim should be apart from holes - append(no_brim_area_object, diff_ex(ex_poly_holes_reversed, offset_ex(ex_poly_holes_reversed, -scale_(5.)))); } if (brim_type == BrimType::btInnerOnly || brim_type == BrimType::btOuterAndInner) { append(brim_area_object, diff_ex(offset_ex(ex_poly_holes_reversed, -brim_offset), offset_ex(ex_poly_holes_reversed, -brim_width - brim_offset))); diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index ea13d7c6c3..988cceea6b 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -795,15 +795,14 @@ void PrintConfigDef::init_fff_params() def->enum_keys_map = &ConfigOptionEnum::get_enum_values(); def->enum_values.emplace_back("auto_brim"); def->enum_values.emplace_back("outer_only"); + def->enum_values.emplace_back("inner_only"); + def->enum_values.emplace_back("outer_and_inner"); def->enum_values.emplace_back("no_brim"); - //def->enum_values.emplace_back("inner_only"); - //def->enum_values.emplace_back("outer_and_inner"); def->enum_labels.emplace_back(L("Auto")); - def->enum_labels.emplace_back(L("Manual")); + def->enum_labels.emplace_back(L("outer_only")); + def->enum_labels.emplace_back(L("Inner brim only")); + def->enum_labels.emplace_back(L("Outer and inner brim")); def->enum_labels.emplace_back(L("No-brim")); - // BBS: The following two types are disabled - //def->enum_labels.emplace_back(L("Inner brim only")); - //def->enum_labels.emplace_back(L("Outer and inner brim")); def->mode = comSimple; def->set_default_value(new ConfigOptionEnum(btAutoBrim)); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 076d76e4a3..b53cdb0a7a 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -155,9 +155,9 @@ enum SLAPillarConnectionMode { enum BrimType { btAutoBrim, // BBS btOuterOnly, - btNoBrim, btInnerOnly, btOuterAndInner, + btNoBrim, }; enum TimelapseType {