diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 3425cfd7a..ba1c7f056 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -591,7 +591,7 @@ void PrintConfigDef::init_fff_params() "Fan speeds for overhang sizes in between are calculated via linear interpolation. "); def = this->add("overhang_fan_speed_0", coInts); - def->label = L("speed for 0\% overlap (bridge)"); + def->label = L("speed for 0% overlap (bridge)"); def->tooltip = fan_speed_setting_description; def->sidetext = L("%"); def->min = 0; @@ -600,7 +600,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionInts{0}); def = this->add("overhang_fan_speed_1", coInts); - def->label = L("speed for 25\% overlap"); + def->label = L("speed for 25% overlap"); def->tooltip = fan_speed_setting_description; def->sidetext = L("%"); def->min = 0; @@ -609,7 +609,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionInts{0}); def = this->add("overhang_fan_speed_2", coInts); - def->label = L("speed for 50\% overlap"); + def->label = L("speed for 50% overlap"); def->tooltip = fan_speed_setting_description; def->sidetext = L("%"); def->min = 0; @@ -618,7 +618,7 @@ void PrintConfigDef::init_fff_params() def->set_default_value(new ConfigOptionInts{0}); def = this->add("overhang_fan_speed_3", coInts); - def->label = L("speed for 75\% overlap"); + def->label = L("speed for 75% overlap"); def->tooltip = fan_speed_setting_description; def->sidetext = L("%"); def->min = 0; diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp index 1511b72cd..f87741cfa 100644 --- a/src/libslic3r/PrintObject.cpp +++ b/src/libslic3r/PrintObject.cpp @@ -1737,7 +1737,7 @@ void PrintObject::bridge_over_infill() lower_layers_sparse_infill.insert(lower_layers_sparse_infill.end(), special_infill.begin(), special_infill.end()); - if (shrink(lower_layers_sparse_infill, 3.0 * scaled(max_bridge_flow_height[candidates.first])).empty()) { + if (shrink(lower_layers_sparse_infill, 3.0 * scale_(max_bridge_flow_height[candidates.first])).empty()) { continue; } } diff --git a/src/libslic3r/SupportSpotsGenerator.cpp b/src/libslic3r/SupportSpotsGenerator.cpp index d45f82db8..5062fe18a 100644 --- a/src/libslic3r/SupportSpotsGenerator.cpp +++ b/src/libslic3r/SupportSpotsGenerator.cpp @@ -901,7 +901,7 @@ std::tuple check_stability(const PrintObject *po, params)) { if (bridge.support_point_generated.has_value()) { reckon_new_support_point(*bridge.support_point_generated, create_support_point_position(bridge.b), - -EPSILON, Vec2f::Zero()); + float(-EPSILON), Vec2f::Zero()); } } } @@ -916,7 +916,7 @@ std::tuple check_stability(const PrintObject *po, params); for (const ExtrusionLine &perim : perims) { if (perim.support_point_generated.has_value()) { - reckon_new_support_point(*perim.support_point_generated, create_support_point_position(perim.b), -EPSILON, + reckon_new_support_point(*perim.support_point_generated, create_support_point_position(perim.b), float(-EPSILON), Vec2f::Zero()); } if (perim.is_external_perimeter()) {