Merge remote-tracking branch 'origin/CURA-12335_expose-bottom-skin-settings' into CURA-12335_expose-bottom-skin-settings

Author: wawanbreton

src/LayerPlan.cpp

@@ -57,15 +57,14 @@ GCodePath* LayerPlan::getLatestPathWithConfig(
     {
         return &paths.back();
     }
-    paths.emplace_back(
-        GCodePath{ .z_offset = z_offset,
-                   .config = config,
-                   .mesh = current_mesh_,
-                   .space_fill_type = space_fill_type,
-                   .flow = flow,
-                   .width_factor = width_factor,
-                   .spiralize = spiralize,
-                   .speed_factor = speed_factor });
+    paths.emplace_back(GCodePath{ .z_offset = z_offset,
+                                  .config = config,
+                                  .mesh = current_mesh_,
+                                  .space_fill_type = space_fill_type,
+                                  .flow = flow,
+                                  .width_factor = width_factor,
+                                  .spiralize = spiralize,
+                                  .speed_factor = speed_factor });
 
     GCodePath* ret = &paths.back();
     ret->skip_agressive_merge_hint = mode_skip_agressive_merge_;

src/settings/MeshPathConfigs.cpp

@@ -158,16 +158,15 @@ MeshPathConfigs::MeshPathConfigs(const SliceMeshStorage& mesh, const coord_t lay
 
     for (const auto combine_idx : ranges::views::iota(1, MAX_INFILL_COMBINE + 1))
     {
-        infill_config.emplace_back(
-            GCodePathConfig{
-                .type = PrintFeatureType::Infill,
-                .line_width = static_cast<coord_t>(
-                    mesh.settings.get<coord_t>("infill_line_width") * line_width_factor_per_extruder[mesh.settings.get<ExtruderTrain&>("infill_extruder_nr").extruder_nr_]),
-                .layer_thickness = layer_thickness,
-                .flow = mesh.settings.get<Ratio>("infill_material_flow") * (layer_nr == 0 ? mesh.settings.get<Ratio>("material_flow_layer_0") : Ratio{ 1.0 }) * combine_idx,
-                .speed_derivatives = { .speed = mesh.settings.get<Velocity>("speed_infill"),
-                                       .acceleration = mesh.settings.get<Acceleration>("acceleration_infill"),
-                                       .jerk = mesh.settings.get<Velocity>("jerk_infill") } });
+        infill_config.emplace_back(GCodePathConfig{
+            .type = PrintFeatureType::Infill,
+            .line_width = static_cast<coord_t>(
+                mesh.settings.get<coord_t>("infill_line_width") * line_width_factor_per_extruder[mesh.settings.get<ExtruderTrain&>("infill_extruder_nr").extruder_nr_]),
+            .layer_thickness = layer_thickness,
+            .flow = mesh.settings.get<Ratio>("infill_material_flow") * (layer_nr == 0 ? mesh.settings.get<Ratio>("material_flow_layer_0") : Ratio{ 1.0 }) * combine_idx,
+            .speed_derivatives = { .speed = mesh.settings.get<Velocity>("speed_infill"),
+                                   .acceleration = mesh.settings.get<Acceleration>("acceleration_infill"),
+                                   .jerk = mesh.settings.get<Velocity>("jerk_infill") } });
     }
 }