Skirt Height for individual extruder instead of using the global setting

CURA-10728
Ultimaker · Jul 14, 2023 · 724d35d · 724d35d
1 parent ef46801
commit 724d35d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/include/utils/actions/smooth.h b/include/utils/actions/smooth.h
@@ -38,7 +38,7 @@ struct smooth_fn
     constexpr auto operator()(Rng&& rng, const utils::integral auto max_resolution, const utils::floating_point auto fluid_angle) const
     {
         const auto size = ranges::distance(rng) - 1;
-        if (size < 3)
+        if (size < 4)
         {
             return static_cast<Rng&&>(rng);
         }

diff --git a/src/SkirtBrim.cpp b/src/SkirtBrim.cpp
@@ -378,6 +378,7 @@ Polygons SkirtBrim::getFirstLayerOutline(const int extruder_nr /* = -1 */)
     {
         reference_extruder_nr = extruder_nr;
     }
+    Settings& extruder_settings = Application::getInstance().current_slice->scene.extruders[reference_extruder_nr].settings;
     const int primary_line_count = line_count[reference_extruder_nr];
     const bool external_only = adhesion_type == EPlatformAdhesion::SKIRT || external_polys_only[reference_extruder_nr]; // Whether to include holes or not. Skirt doesn't have any holes.
     const LayerIndex layer_nr = 0;
@@ -387,7 +388,7 @@ Polygons SkirtBrim::getFirstLayerOutline(const int extruder_nr /* = -1 */)
         const bool skirt_around_prime_tower_brim = storage.primeTower.enabled && global_settings.get<bool>("prime_tower_brim_enable");
         const bool include_prime_tower = ! skirt_around_prime_tower_brim; // include manually otherwise
 
-        const int skirt_height = global_settings.get<int>("skirt_height");
+        const int skirt_height = extruder_settings.get<int>("skirt_height");
         first_layer_outline = Polygons();
         for (int i_layer = layer_nr; i_layer <= skirt_height; ++i_layer)
         {

diff --git a/src/pathPlanning/Comb.cpp b/src/pathPlanning/Comb.cpp
@@ -131,8 +131,8 @@ bool Comb::calc
     unsigned int end_inside_poly_min = NO_INDEX;
     const bool end_inside_min = moveInside(boundary_inside_minimum, _end_inside, inside_loc_to_line_minimum.get(), end_point, end_inside_poly_min);
 
-    unsigned int start_part_boundary_poly_idx_min;
-    unsigned int end_part_boundary_poly_idx_min;
+    unsigned int start_part_boundary_poly_idx_min  { };
+    unsigned int end_part_boundary_poly_idx_min  { };
     unsigned int start_part_idx_min =   (start_inside_poly_min == NO_INDEX)?    NO_INDEX : partsView_inside_minimum.getPartContaining(start_inside_poly_min, &start_part_boundary_poly_idx_min);
     unsigned int end_part_idx_min =     (end_inside_poly_min == NO_INDEX)?      NO_INDEX : partsView_inside_minimum.getPartContaining(end_inside_poly_min, &end_part_boundary_poly_idx_min);