From a935cee82a24722fbedabfd93d456e0a269a1e0f Mon Sep 17 00:00:00 2001
From: Remco Burema <r.burema@ultimaker.com>
Date: Wed, 10 Jan 2024 08:52:52 +0100
Subject: [PATCH 1/2] Remove 'support_interface_skip_height' setting.

Was used for run-time efficiency, but it wasn't really ever set beyond one layer-height, which made it rather useless.

engine part of CURA-11157
---
 include/TreeSupportSettings.h           | 2 +-
 src/support.cpp                         | 6 ++----
 stress_benchmark/resources/001.settings | 1 -
 stress_benchmark/resources/002.settings | 2 --
 stress_benchmark/resources/003.settings | 2 --
 stress_benchmark/resources/004.settings | 2 --
 stress_benchmark/resources/005.settings | 2 --
 stress_benchmark/resources/006.settings | 2 --
 stress_benchmark/resources/007.settings | 2 --
 stress_benchmark/resources/008.settings | 2 --
 stress_benchmark/resources/009.settings | 2 --
 stress_benchmark/resources/010.settings | 2 --
 stress_benchmark/resources/011.settings | 2 --
 stress_benchmark/resources/012.settings | 1 -
 stress_benchmark/resources/013.settings | 1 -
 stress_benchmark/resources/014.settings | 1 -
 stress_benchmark/resources/015.settings | 1 -
 stress_benchmark/resources/016.settings | 1 -
 stress_benchmark/resources/017.settings | 1 -
 stress_benchmark/resources/018.settings | 1 -
 stress_benchmark/resources/019.settings | 1 -
 stress_benchmark/resources/020.settings | 1 -
 stress_benchmark/resources/021.settings | 1 -
 stress_benchmark/resources/022.settings | 1 -
 stress_benchmark/resources/023.settings | 1 -
 stress_benchmark/resources/024.settings | 1 -
 stress_benchmark/resources/025.settings | 1 -
 stress_benchmark/resources/026.settings | 1 -
 stress_benchmark/resources/027.settings | 1 -
 stress_benchmark/resources/028.settings | 1 -
 stress_benchmark/resources/029.settings | 1 -
 stress_benchmark/resources/030.settings | 1 -
 stress_benchmark/resources/031.settings | 1 -
 stress_benchmark/resources/032.settings | 1 -
 stress_benchmark/resources/033.settings | 1 -
 stress_benchmark/resources/034.settings | 1 -
 stress_benchmark/resources/035.settings | 1 -
 stress_benchmark/resources/036.settings | 1 -
 stress_benchmark/resources/037.settings | 1 -
 stress_benchmark/resources/038.settings | 1 -
 stress_benchmark/resources/039.settings | 1 -
 stress_benchmark/resources/040.settings | 1 -
 stress_benchmark/resources/041.settings | 1 -
 stress_benchmark/resources/042.settings | 1 -
 stress_benchmark/resources/043.settings | 1 -
 stress_benchmark/resources/044.settings | 1 -
 stress_benchmark/resources/045.settings | 1 -
 stress_benchmark/resources/046.settings | 1 -
 stress_benchmark/resources/047.settings | 1 -
 stress_benchmark/resources/048.settings | 1 -
 stress_benchmark/resources/049.settings | 1 -
 stress_benchmark/resources/050.settings | 1 -
 stress_benchmark/resources/051.settings | 1 -
 stress_benchmark/resources/052.settings | 1 -
 stress_benchmark/resources/053.settings | 1 -
 stress_benchmark/resources/054.settings | 1 -
 stress_benchmark/resources/055.settings | 1 -
 stress_benchmark/resources/056.settings | 1 -
 stress_benchmark/resources/057.settings | 1 -
 stress_benchmark/resources/058.settings | 1 -
 stress_benchmark/resources/059.settings | 1 -
 stress_benchmark/resources/060.settings | 1 -
 stress_benchmark/resources/061.settings | 1 -
 stress_benchmark/resources/062.settings | 1 -
 stress_benchmark/resources/063.settings | 1 -
 stress_benchmark/resources/064.settings | 1 -
 stress_benchmark/resources/065.settings | 1 -
 stress_benchmark/resources/066.settings | 1 -
 stress_benchmark/resources/067.settings | 1 -
 tests/test_global_settings.txt          | 1 -
 70 files changed, 3 insertions(+), 83 deletions(-)

diff --git a/include/TreeSupportSettings.h b/include/TreeSupportSettings.h
index 78be092694..53075f7d9d 100644
--- a/include/TreeSupportSettings.h
+++ b/include/TreeSupportSettings.h
@@ -56,7 +56,7 @@ struct TreeSupportSettings
         , xy_min_distance(support_overrides == SupportDistPriority::Z_OVERRIDES_XY ? mesh_group_settings.get<coord_t>("support_xy_distance_overhang") : xy_distance)
         , z_distance_top_layers(round_up_divide(mesh_group_settings.get<coord_t>("support_top_distance"), layer_height))
         , z_distance_bottom_layers(round_up_divide(mesh_group_settings.get<coord_t>("support_bottom_distance"), layer_height))
-        , performance_interface_skip_layers(round_up_divide(mesh_group_settings.get<coord_t>("support_interface_skip_height"), layer_height))
+        , performance_interface_skip_layers(1UL)
         , support_infill_angles(mesh_group_settings.get<std::vector<AngleDegrees>>("support_infill_angles"))
         , support_roof_angles(mesh_group_settings.get<std::vector<AngleDegrees>>("support_roof_angles"))
         , roof_pattern(mesh_group_settings.get<EFillMethod>("support_roof_pattern"))
diff --git a/src/support.cpp b/src/support.cpp
index 5db274bfdd..3327f91dc2 100644
--- a/src/support.cpp
+++ b/src/support.cpp
@@ -1673,8 +1673,7 @@ void AreaSupport::generateSupportBottom(SliceDataStorage& storage, const SliceMe
         return;
     }
     const coord_t z_distance_bottom = round_up_divide(mesh.settings.get<coord_t>("support_bottom_distance"), layer_height); // Number of layers between support bottom and model.
-    const size_t skip_layer_count
-        = std::max(uint64_t(1), round_divide(mesh.settings.get<coord_t>("support_interface_skip_height"), layer_height)); // Resolution of generating support bottoms above model.
+    const size_t skip_layer_count = 1UL; // Resolution of generating support bottoms above model.
     const coord_t bottom_line_width = mesh_group_settings.get<ExtruderTrain&>("support_bottom_extruder_nr").settings_.get<coord_t>("support_bottom_line_width");
     const coord_t bottom_outline_offset = mesh_group_settings.get<ExtruderTrain&>("support_bottom_extruder_nr").settings_.get<coord_t>("support_bottom_offset");
 
@@ -1710,8 +1709,7 @@ void AreaSupport::generateSupportRoof(SliceDataStorage& storage, const SliceMesh
         return;
     }
     const coord_t z_distance_top = round_up_divide(mesh.settings.get<coord_t>("support_top_distance"), layer_height); // Number of layers between support roof and model.
-    const size_t skip_layer_count
-        = std::max(uint64_t(1), round_divide(mesh.settings.get<coord_t>("support_interface_skip_height"), layer_height)); // Resolution of generating support roof below model.
+    const size_t skip_layer_count = 1UL; // Resolution of generating support roof below model.
     const coord_t roof_line_width = mesh_group_settings.get<ExtruderTrain&>("support_roof_extruder_nr").settings_.get<coord_t>("support_roof_line_width");
     const coord_t roof_outline_offset = mesh_group_settings.get<ExtruderTrain&>("support_roof_extruder_nr").settings_.get<coord_t>("support_roof_offset");
 
diff --git a/stress_benchmark/resources/001.settings b/stress_benchmark/resources/001.settings
index d56461c776..3849eb34f1 100644
--- a/stress_benchmark/resources/001.settings
+++ b/stress_benchmark/resources/001.settings
@@ -41,7 +41,6 @@ speed_wall_0_roofing=45
 bottom_skin_preshrink=0
 min_feature_size=0.1
 brim_replaces_support=True
-support_interface_skip_height=0.2
 prime_tower_wipe_enabled=True
 gantry_height=320
 material_surface_energy=70
diff --git a/stress_benchmark/resources/002.settings b/stress_benchmark/resources/002.settings
index c5ec85db58..1f752cfdbe 100644
--- a/stress_benchmark/resources/002.settings
+++ b/stress_benchmark/resources/002.settings
@@ -580,7 +580,6 @@ support_tree_max_diameter_increase_by_merges_when_support_to_model=1
 adaptive_layer_height_threshold=0.1
 support_interface_height=0.8
 support_brim_enable=True
-support_interface_skip_height=0.2
 jerk_support_infill=8
 wall_overhang_speed_factor=100
 acceleration_travel=500
@@ -966,7 +965,6 @@ machine_extruders_shared_nozzle_initial_retraction=0
 extruder_prime_pos_abs=False
 support_tower_maximum_supported_diameter=3.0
 support_tree_angle=45
-support_interface_skip_height=0.2
 jerk_support_infill=8
 wall_overhang_speed_factor=100
 infill_before_walls=False
diff --git a/stress_benchmark/resources/003.settings b/stress_benchmark/resources/003.settings
index d0fd7a001a..330c346fb2 100644
--- a/stress_benchmark/resources/003.settings
+++ b/stress_benchmark/resources/003.settings
@@ -581,7 +581,6 @@ support_tree_max_diameter_increase_by_merges_when_support_to_model=1
 adaptive_layer_height_threshold=0.2
 support_interface_height=0.96
 support_brim_enable=True
-support_interface_skip_height=0.12
 jerk_support_infill=12.0
 wall_overhang_speed_factor=100
 acceleration_travel=500
@@ -967,7 +966,6 @@ machine_extruders_shared_nozzle_initial_retraction=0
 extruder_prime_pos_abs=False
 support_tower_maximum_supported_diameter=3.0
 support_tree_angle=50
-support_interface_skip_height=0.12
 jerk_support_infill=12.0
 wall_overhang_speed_factor=100
 infill_before_walls=False
diff --git a/stress_benchmark/resources/004.settings b/stress_benchmark/resources/004.settings
index 4683743db7..83140caf8b 100644
--- a/stress_benchmark/resources/004.settings
+++ b/stress_benchmark/resources/004.settings
@@ -581,7 +581,6 @@ support_tree_max_diameter_increase_by_merges_when_support_to_model=1
 adaptive_layer_height_threshold=0.2
 support_interface_height=0.8
 support_brim_enable=True
-support_interface_skip_height=0.1
 jerk_support_infill=8
 wall_overhang_speed_factor=100
 acceleration_travel=500
@@ -967,7 +966,6 @@ machine_extruders_shared_nozzle_initial_retraction=0
 extruder_prime_pos_abs=False
 support_tower_maximum_supported_diameter=3.0
 support_tree_angle=55
-support_interface_skip_height=0.1
 jerk_support_infill=8
 wall_overhang_speed_factor=100
 infill_before_walls=False
diff --git a/stress_benchmark/resources/005.settings b/stress_benchmark/resources/005.settings
index b4ee5d4563..cb3bd971ce 100644
--- a/stress_benchmark/resources/005.settings
+++ b/stress_benchmark/resources/005.settings
@@ -582,7 +582,6 @@ support_tree_max_diameter_increase_by_merges_when_support_to_model=1
 adaptive_layer_height_threshold=0.2
 support_interface_height=0.8
 support_brim_enable=True
-support_interface_skip_height=0.2
 jerk_support_infill=8
 wall_overhang_speed_factor=100
 acceleration_travel=500
@@ -968,7 +967,6 @@ machine_extruders_shared_nozzle_initial_retraction=0
 extruder_prime_pos_abs=False
 support_tower_maximum_supported_diameter=3.0
 support_tree_angle=65.0
-support_interface_skip_height=0.2
 jerk_support_infill=8
 wall_overhang_speed_factor=100
 infill_before_walls=False
diff --git a/stress_benchmark/resources/006.settings b/stress_benchmark/resources/006.settings
index ec75660851..8c3d9f942c 100644
--- a/stress_benchmark/resources/006.settings
+++ b/stress_benchmark/resources/006.settings
@@ -582,7 +582,6 @@ support_tree_max_diameter_increase_by_merges_when_support_to_model=1
 adaptive_layer_height_threshold=0.2
 support_interface_height=0.8
 support_brim_enable=True
-support_interface_skip_height=0.2
 jerk_support_infill=8
 wall_overhang_speed_factor=100
 acceleration_travel=500
@@ -968,7 +967,6 @@ machine_extruders_shared_nozzle_initial_retraction=0
 extruder_prime_pos_abs=False
 support_tower_maximum_supported_diameter=3.0
 support_tree_angle=60.0
-support_interface_skip_height=0.2
 jerk_support_infill=8
 wall_overhang_speed_factor=100
 infill_before_walls=False
diff --git a/stress_benchmark/resources/007.settings b/stress_benchmark/resources/007.settings
index 635226ed8c..6f89820d42 100644
--- a/stress_benchmark/resources/007.settings
+++ b/stress_benchmark/resources/007.settings
@@ -582,7 +582,6 @@ support_tree_max_diameter_increase_by_merges_when_support_to_model=1
 adaptive_layer_height_threshold=0.2
 support_interface_height=0.8
 support_brim_enable=True
-support_interface_skip_height=0.2
 jerk_support_infill=8
 wall_overhang_speed_factor=100
 acceleration_travel=500
@@ -968,7 +967,6 @@ machine_extruders_shared_nozzle_initial_retraction=0
 extruder_prime_pos_abs=False
 support_tower_maximum_supported_diameter=3.0
 support_tree_angle=45
-support_interface_skip_height=0.2
 jerk_support_infill=8
 wall_overhang_speed_factor=100
 infill_before_walls=False
diff --git a/stress_benchmark/resources/008.settings b/stress_benchmark/resources/008.settings
index f4771e572b..d3814bac6a 100644
--- a/stress_benchmark/resources/008.settings
+++ b/stress_benchmark/resources/008.settings
@@ -286,7 +286,6 @@ ironing_line_spacing=0.1
 material_bed_temp_prepend=True
 infill_before_walls=True
 material=0
-support_interface_skip_height=0.15
 blackmagic=0
 support_brim_line_count=3
 infill_support_enabled=False
@@ -1085,7 +1084,6 @@ machine_feeder_wheel_diameter=10.0
 bridge_skin_support_threshold=50
 prime_tower_min_volume=6
 roofing_material_flow=100
-support_interface_skip_height=0.15
 infill_wall_line_count=0
 support_supported_skin_fan_speed=100
 bridge_sparse_infill_max_density=0
diff --git a/stress_benchmark/resources/009.settings b/stress_benchmark/resources/009.settings
index f4771e572b..d3814bac6a 100644
--- a/stress_benchmark/resources/009.settings
+++ b/stress_benchmark/resources/009.settings
@@ -286,7 +286,6 @@ ironing_line_spacing=0.1
 material_bed_temp_prepend=True
 infill_before_walls=True
 material=0
-support_interface_skip_height=0.15
 blackmagic=0
 support_brim_line_count=3
 infill_support_enabled=False
@@ -1085,7 +1084,6 @@ machine_feeder_wheel_diameter=10.0
 bridge_skin_support_threshold=50
 prime_tower_min_volume=6
 roofing_material_flow=100
-support_interface_skip_height=0.15
 infill_wall_line_count=0
 support_supported_skin_fan_speed=100
 bridge_sparse_infill_max_density=0
diff --git a/stress_benchmark/resources/010.settings b/stress_benchmark/resources/010.settings
index f4771e572b..d3814bac6a 100644
--- a/stress_benchmark/resources/010.settings
+++ b/stress_benchmark/resources/010.settings
@@ -286,7 +286,6 @@ ironing_line_spacing=0.1
 material_bed_temp_prepend=True
 infill_before_walls=True
 material=0
-support_interface_skip_height=0.15
 blackmagic=0
 support_brim_line_count=3
 infill_support_enabled=False
@@ -1085,7 +1084,6 @@ machine_feeder_wheel_diameter=10.0
 bridge_skin_support_threshold=50
 prime_tower_min_volume=6
 roofing_material_flow=100
-support_interface_skip_height=0.15
 infill_wall_line_count=0
 support_supported_skin_fan_speed=100
 bridge_sparse_infill_max_density=0
diff --git a/stress_benchmark/resources/011.settings b/stress_benchmark/resources/011.settings
index 3f63e86a10..000b2a4400 100644
--- a/stress_benchmark/resources/011.settings
+++ b/stress_benchmark/resources/011.settings
@@ -583,7 +583,6 @@ support_tree_max_diameter_increase_by_merges_when_support_to_model=1
 adaptive_layer_height_threshold=0.2
 support_interface_height=1
 support_brim_enable=True
-support_interface_skip_height=0.2
 jerk_support_infill=20
 wall_overhang_speed_factor=100
 acceleration_travel=5000
@@ -968,7 +967,6 @@ machine_extruders_shared_nozzle_initial_retraction=0
 extruder_prime_pos_abs=False
 support_tower_maximum_supported_diameter=3.0
 support_tree_angle=50
-support_interface_skip_height=0.2
 jerk_support_infill=20
 wall_overhang_speed_factor=100
 infill_before_walls=True
diff --git a/stress_benchmark/resources/012.settings b/stress_benchmark/resources/012.settings
index 712087c5e2..5480603f28 100644
--- a/stress_benchmark/resources/012.settings
+++ b/stress_benchmark/resources/012.settings
@@ -253,7 +253,6 @@ prime_tower_position_y=118.80000000000001
 mesh_position_x=0
 mold_width=5
 adhesion_extruder_nr=0
-support_interface_skip_height=0.2
 jerk_support_infill=12.5
 wall_overhang_speed_factor=100
 material_bed_temp_prepend=True
diff --git a/stress_benchmark/resources/013.settings b/stress_benchmark/resources/013.settings
index dd1893e2c9..b2b645d2c1 100644
--- a/stress_benchmark/resources/013.settings
+++ b/stress_benchmark/resources/013.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=2.4
 clean_between_layers=False
-support_interface_skip_height=0.1
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=False
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/014.settings b/stress_benchmark/resources/014.settings
index 3838f85463..fb5a8fdb0a 100644
--- a/stress_benchmark/resources/014.settings
+++ b/stress_benchmark/resources/014.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=1.2000000000000002
 clean_between_layers=False
-support_interface_skip_height=0.2
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=True
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/015.settings b/stress_benchmark/resources/015.settings
index b2a53600c9..b38b508fd5 100644
--- a/stress_benchmark/resources/015.settings
+++ b/stress_benchmark/resources/015.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=0.8
 clean_between_layers=False
-support_interface_skip_height=0.2
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=False
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/016.settings b/stress_benchmark/resources/016.settings
index af2f42cf1e..adb3746397 100644
--- a/stress_benchmark/resources/016.settings
+++ b/stress_benchmark/resources/016.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=0.8
 clean_between_layers=False
-support_interface_skip_height=0.2
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=False
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/017.settings b/stress_benchmark/resources/017.settings
index 02d045445e..64a0933343 100644
--- a/stress_benchmark/resources/017.settings
+++ b/stress_benchmark/resources/017.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=0.84
 clean_between_layers=False
-support_interface_skip_height=0.12
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=True
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/018.settings b/stress_benchmark/resources/018.settings
index 2b377d53e0..5299b94f3e 100644
--- a/stress_benchmark/resources/018.settings
+++ b/stress_benchmark/resources/018.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=0.8
 clean_between_layers=False
-support_interface_skip_height=0.2
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=False
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/019.settings b/stress_benchmark/resources/019.settings
index 8910e83a35..c964872a69 100644
--- a/stress_benchmark/resources/019.settings
+++ b/stress_benchmark/resources/019.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=0.8
 clean_between_layers=False
-support_interface_skip_height=0.2
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=False
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/020.settings b/stress_benchmark/resources/020.settings
index 87cecf33c7..8f710bd9ab 100644
--- a/stress_benchmark/resources/020.settings
+++ b/stress_benchmark/resources/020.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=0.8
 clean_between_layers=False
-support_interface_skip_height=0.25
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=False
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/021.settings b/stress_benchmark/resources/021.settings
index 8ddb9175ff..a153001149 100644
--- a/stress_benchmark/resources/021.settings
+++ b/stress_benchmark/resources/021.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=0.5
 skin_preshrink=0.8
 clean_between_layers=False
-support_interface_skip_height=0.15
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=True
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/022.settings b/stress_benchmark/resources/022.settings
index 6d484adf38..dea4c9271e 100644
--- a/stress_benchmark/resources/022.settings
+++ b/stress_benchmark/resources/022.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=0.8400000000000001
 clean_between_layers=False
-support_interface_skip_height=0.2
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=False
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/023.settings b/stress_benchmark/resources/023.settings
index abc56c6905..2527131542 100644
--- a/stress_benchmark/resources/023.settings
+++ b/stress_benchmark/resources/023.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=0.8
 clean_between_layers=False
-support_interface_skip_height=0.2
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=False
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/024.settings b/stress_benchmark/resources/024.settings
index 05c420b03e..17cab2dd7c 100644
--- a/stress_benchmark/resources/024.settings
+++ b/stress_benchmark/resources/024.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=0.8
 clean_between_layers=False
-support_interface_skip_height=0.1
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=False
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/025.settings b/stress_benchmark/resources/025.settings
index a6e3d3500e..3677da8d2d 100644
--- a/stress_benchmark/resources/025.settings
+++ b/stress_benchmark/resources/025.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=0.8
 clean_between_layers=False
-support_interface_skip_height=0.1
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=False
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/026.settings b/stress_benchmark/resources/026.settings
index a008515e9f..deff65c0f7 100644
--- a/stress_benchmark/resources/026.settings
+++ b/stress_benchmark/resources/026.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=0.8
 clean_between_layers=False
-support_interface_skip_height=0.06
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=True
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/027.settings b/stress_benchmark/resources/027.settings
index 1b4b00078a..dd108973eb 100644
--- a/stress_benchmark/resources/027.settings
+++ b/stress_benchmark/resources/027.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=2
 skin_preshrink=0.8
 clean_between_layers=False
-support_interface_skip_height=0.15
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=True
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/028.settings b/stress_benchmark/resources/028.settings
index 7f958d05c2..367b90c1f3 100644
--- a/stress_benchmark/resources/028.settings
+++ b/stress_benchmark/resources/028.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=1.6
 clean_between_layers=False
-support_interface_skip_height=0.2
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=False
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/029.settings b/stress_benchmark/resources/029.settings
index 823bf8129b..ebf3cc0880 100644
--- a/stress_benchmark/resources/029.settings
+++ b/stress_benchmark/resources/029.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=1.2000000000000002
 clean_between_layers=False
-support_interface_skip_height=0.2
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=True
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/030.settings b/stress_benchmark/resources/030.settings
index f003931b0a..a66cd76312 100644
--- a/stress_benchmark/resources/030.settings
+++ b/stress_benchmark/resources/030.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=0.8
 clean_between_layers=False
-support_interface_skip_height=0.1
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=True
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/031.settings b/stress_benchmark/resources/031.settings
index 35ea2a8526..37fae2ad78 100644
--- a/stress_benchmark/resources/031.settings
+++ b/stress_benchmark/resources/031.settings
@@ -6,7 +6,6 @@ resolution=0
 _plugin__curaenginegradualflow__0_1_0__layer_0_max_flow_acceleration=1
 skin_preshrink=0.8
 clean_between_layers=False
-support_interface_skip_height=0.2
 machine_feeder_wheel_diameter=10.0
 retraction_hop_only_when_collides=False
 machine_steps_per_mm_y=50
diff --git a/stress_benchmark/resources/032.settings b/stress_benchmark/resources/032.settings
index 8187ab3099..af81c5cbd2 100644
--- a/stress_benchmark/resources/032.settings
+++ b/stress_benchmark/resources/032.settings
@@ -530,7 +530,6 @@ skirt_brim_minimal_length=250
 cooling=0
 brim_replaces_support=True
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.2
 machine_nozzle_head_distance=3
 support_bottom_pattern=concentric
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/033.settings b/stress_benchmark/resources/033.settings
index 5783e17291..702f74df84 100644
--- a/stress_benchmark/resources/033.settings
+++ b/stress_benchmark/resources/033.settings
@@ -532,7 +532,6 @@ skirt_brim_minimal_length=250
 cooling=0
 brim_replaces_support=True
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.2
 machine_nozzle_head_distance=3
 support_bottom_pattern=concentric
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/034.settings b/stress_benchmark/resources/034.settings
index 0ed9af0382..12ec3890b6 100644
--- a/stress_benchmark/resources/034.settings
+++ b/stress_benchmark/resources/034.settings
@@ -529,7 +529,6 @@ skirt_brim_minimal_length=250
 cooling=0
 brim_replaces_support=False
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.2
 machine_nozzle_head_distance=3
 support_bottom_pattern=grid
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/035.settings b/stress_benchmark/resources/035.settings
index 0106e70349..12626c05d4 100644
--- a/stress_benchmark/resources/035.settings
+++ b/stress_benchmark/resources/035.settings
@@ -531,7 +531,6 @@ skirt_brim_minimal_length=250
 cooling=0
 brim_replaces_support=False
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.2
 machine_nozzle_head_distance=3
 support_bottom_pattern=grid
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/036.settings b/stress_benchmark/resources/036.settings
index 496ddb57a3..ea74d62e4d 100644
--- a/stress_benchmark/resources/036.settings
+++ b/stress_benchmark/resources/036.settings
@@ -530,7 +530,6 @@ skirt_brim_minimal_length=250
 cooling=0
 brim_replaces_support=False
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.12
 machine_nozzle_head_distance=3
 support_bottom_pattern=grid
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/037.settings b/stress_benchmark/resources/037.settings
index 4a40bf459b..a9bec27238 100644
--- a/stress_benchmark/resources/037.settings
+++ b/stress_benchmark/resources/037.settings
@@ -530,7 +530,6 @@ skirt_brim_minimal_length=250
 cooling=0
 brim_replaces_support=False
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.1
 machine_nozzle_head_distance=3
 support_bottom_pattern=grid
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/038.settings b/stress_benchmark/resources/038.settings
index 853b097d2d..8d8f2bc532 100644
--- a/stress_benchmark/resources/038.settings
+++ b/stress_benchmark/resources/038.settings
@@ -531,7 +531,6 @@ skirt_brim_minimal_length=250
 cooling=0
 brim_replaces_support=False
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.2
 machine_nozzle_head_distance=3
 support_bottom_pattern=grid
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/039.settings b/stress_benchmark/resources/039.settings
index 3810b98181..e896ca5fad 100644
--- a/stress_benchmark/resources/039.settings
+++ b/stress_benchmark/resources/039.settings
@@ -531,7 +531,6 @@ skirt_brim_minimal_length=250
 cooling=0
 brim_replaces_support=False
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.2
 machine_nozzle_head_distance=3
 support_bottom_pattern=grid
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/040.settings b/stress_benchmark/resources/040.settings
index 9df0af97c1..1bef888ee4 100644
--- a/stress_benchmark/resources/040.settings
+++ b/stress_benchmark/resources/040.settings
@@ -530,7 +530,6 @@ skirt_brim_minimal_length=250
 cooling=0
 brim_replaces_support=True
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.25
 machine_nozzle_head_distance=3
 support_bottom_pattern=concentric
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/041.settings b/stress_benchmark/resources/041.settings
index 6054309199..7a89fa3b6b 100644
--- a/stress_benchmark/resources/041.settings
+++ b/stress_benchmark/resources/041.settings
@@ -534,7 +534,6 @@ skirt_brim_minimal_length=450
 cooling=0
 brim_replaces_support=False
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.1
 machine_nozzle_head_distance=3
 support_bottom_pattern=triangles
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/042.settings b/stress_benchmark/resources/042.settings
index 91100ebe88..f905fe697a 100644
--- a/stress_benchmark/resources/042.settings
+++ b/stress_benchmark/resources/042.settings
@@ -531,7 +531,6 @@ skirt_brim_minimal_length=25
 cooling=0
 brim_replaces_support=True
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.2
 machine_nozzle_head_distance=3
 support_bottom_pattern=concentric
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/043.settings b/stress_benchmark/resources/043.settings
index 6e142cc7e7..914b2ee846 100644
--- a/stress_benchmark/resources/043.settings
+++ b/stress_benchmark/resources/043.settings
@@ -533,7 +533,6 @@ skirt_brim_minimal_length=250
 cooling=0
 brim_replaces_support=True
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.1
 machine_nozzle_head_distance=3
 support_bottom_pattern=zigzag
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/044.settings b/stress_benchmark/resources/044.settings
index db0ea47a59..a58c7b5a4e 100644
--- a/stress_benchmark/resources/044.settings
+++ b/stress_benchmark/resources/044.settings
@@ -533,7 +533,6 @@ skirt_brim_minimal_length=250
 cooling=0
 brim_replaces_support=True
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.06
 machine_nozzle_head_distance=3
 support_bottom_pattern=zigzag
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/045.settings b/stress_benchmark/resources/045.settings
index c93fd544aa..15c3de63cb 100644
--- a/stress_benchmark/resources/045.settings
+++ b/stress_benchmark/resources/045.settings
@@ -532,7 +532,6 @@ skirt_brim_minimal_length=250
 cooling=0
 brim_replaces_support=True
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.2
 machine_nozzle_head_distance=3
 support_bottom_pattern=concentric
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/046.settings b/stress_benchmark/resources/046.settings
index 2ebb338bdb..0236844fae 100644
--- a/stress_benchmark/resources/046.settings
+++ b/stress_benchmark/resources/046.settings
@@ -532,7 +532,6 @@ skirt_brim_minimal_length=250
 cooling=0
 brim_replaces_support=False
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.2
 machine_nozzle_head_distance=3
 support_bottom_pattern=grid
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/047.settings b/stress_benchmark/resources/047.settings
index 49e632dc16..f7260f126b 100644
--- a/stress_benchmark/resources/047.settings
+++ b/stress_benchmark/resources/047.settings
@@ -532,7 +532,6 @@ skirt_brim_minimal_length=250
 cooling=0
 brim_replaces_support=True
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.2
 machine_nozzle_head_distance=3
 support_bottom_pattern=concentric
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/048.settings b/stress_benchmark/resources/048.settings
index 73eacc8380..9ce23cc486 100644
--- a/stress_benchmark/resources/048.settings
+++ b/stress_benchmark/resources/048.settings
@@ -530,7 +530,6 @@ skirt_brim_minimal_length=250
 cooling=0
 brim_replaces_support=False
 wall_x_extruder_nr=-1
-support_interface_skip_height=0.12
 machine_nozzle_head_distance=3
 support_bottom_pattern=grid
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/049.settings b/stress_benchmark/resources/049.settings
index 8a534c14c4..3e8a7724eb 100644
--- a/stress_benchmark/resources/049.settings
+++ b/stress_benchmark/resources/049.settings
@@ -71,7 +71,6 @@ raft_margin=15
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.12
 machine_nozzle_head_distance=3
-support_interface_skip_height=0.12
 support_bottom_pattern=grid
 bottom_thickness=0.8
 cool_fan_enabled=True
diff --git a/stress_benchmark/resources/050.settings b/stress_benchmark/resources/050.settings
index bee0e8f4ce..5f93bb5e0d 100644
--- a/stress_benchmark/resources/050.settings
+++ b/stress_benchmark/resources/050.settings
@@ -71,7 +71,6 @@ raft_margin=15
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.2
 machine_nozzle_head_distance=3
-support_interface_skip_height=0.2
 support_bottom_pattern=concentric
 bottom_thickness=0
 cool_fan_enabled=True
diff --git a/stress_benchmark/resources/051.settings b/stress_benchmark/resources/051.settings
index fd55479c67..f5bc08e63b 100644
--- a/stress_benchmark/resources/051.settings
+++ b/stress_benchmark/resources/051.settings
@@ -71,7 +71,6 @@ raft_margin=0
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.12
 machine_nozzle_head_distance=3
-support_interface_skip_height=0.12
 support_bottom_pattern=lines
 bottom_thickness=0.96
 cool_fan_enabled=True
diff --git a/stress_benchmark/resources/052.settings b/stress_benchmark/resources/052.settings
index 629a0a2715..6d2e982be2 100644
--- a/stress_benchmark/resources/052.settings
+++ b/stress_benchmark/resources/052.settings
@@ -71,7 +71,6 @@ raft_margin=5
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.28
 machine_nozzle_head_distance=3
-support_interface_skip_height=0.28
 support_bottom_pattern=grid
 bottom_thickness=1.4000000000000001
 cool_fan_enabled=True
diff --git a/stress_benchmark/resources/053.settings b/stress_benchmark/resources/053.settings
index 5f59343201..466c3f672e 100644
--- a/stress_benchmark/resources/053.settings
+++ b/stress_benchmark/resources/053.settings
@@ -71,7 +71,6 @@ raft_margin=15
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.1
 machine_nozzle_head_distance=5
-support_interface_skip_height=0.1
 support_bottom_pattern=zigzag
 bottom_thickness=0.8
 cool_fan_enabled=True
diff --git a/stress_benchmark/resources/054.settings b/stress_benchmark/resources/054.settings
index 41766d28d4..7555bc53d9 100644
--- a/stress_benchmark/resources/054.settings
+++ b/stress_benchmark/resources/054.settings
@@ -71,7 +71,6 @@ raft_margin=15
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.2
 machine_nozzle_head_distance=3
-support_interface_skip_height=0.2
 support_bottom_pattern=concentric
 bottom_thickness=1.2
 cool_fan_enabled=True
diff --git a/stress_benchmark/resources/055.settings b/stress_benchmark/resources/055.settings
index d4d7856ea3..82666c4c84 100644
--- a/stress_benchmark/resources/055.settings
+++ b/stress_benchmark/resources/055.settings
@@ -71,7 +71,6 @@ raft_margin=15
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.2
 machine_nozzle_head_distance=3
-support_interface_skip_height=0.2
 support_bottom_pattern=concentric
 bottom_thickness=0.8
 cool_fan_enabled=True
diff --git a/stress_benchmark/resources/056.settings b/stress_benchmark/resources/056.settings
index ae77715c21..d79bf6251b 100644
--- a/stress_benchmark/resources/056.settings
+++ b/stress_benchmark/resources/056.settings
@@ -71,7 +71,6 @@ raft_margin=15
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.1
 machine_nozzle_head_distance=3
-support_interface_skip_height=0.1
 support_bottom_pattern=concentric
 bottom_thickness=0.8
 cool_fan_enabled=True
diff --git a/stress_benchmark/resources/057.settings b/stress_benchmark/resources/057.settings
index e69a30998b..1f547333b0 100644
--- a/stress_benchmark/resources/057.settings
+++ b/stress_benchmark/resources/057.settings
@@ -71,7 +71,6 @@ raft_margin=15
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.5
 machine_nozzle_head_distance=3
-support_interface_skip_height=0.2
 support_bottom_pattern=grid
 bottom_thickness=1.7
 cool_fan_enabled=True
diff --git a/stress_benchmark/resources/058.settings b/stress_benchmark/resources/058.settings
index 146ed80f11..fb5ba8b1c4 100644
--- a/stress_benchmark/resources/058.settings
+++ b/stress_benchmark/resources/058.settings
@@ -71,7 +71,6 @@ raft_margin=15
 support_tree_branch_diameter_angle=7
 prime_tower_base_height=0.12
 machine_nozzle_head_distance=3
-support_interface_skip_height=0.12
 support_bottom_pattern=grid
 bottom_thickness=0.96
 cool_fan_enabled=True
diff --git a/stress_benchmark/resources/059.settings b/stress_benchmark/resources/059.settings
index 878cc7f8b5..2c615e9841 100644
--- a/stress_benchmark/resources/059.settings
+++ b/stress_benchmark/resources/059.settings
@@ -609,7 +609,6 @@ machine_firmware_retract=False
 support_tree_angle=45
 support_tree_bp_diameter=7.5
 skirt_brim_speed=25
-support_interface_skip_height=0.2
 machine_nozzle_head_distance=3
 support_bottom_pattern=grid
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/060.settings b/stress_benchmark/resources/060.settings
index 9fd982aca1..4bfa9153d2 100644
--- a/stress_benchmark/resources/060.settings
+++ b/stress_benchmark/resources/060.settings
@@ -608,7 +608,6 @@ machine_firmware_retract=False
 support_tree_angle=63
 support_tree_bp_diameter=7.5
 skirt_brim_speed=20.0
-support_interface_skip_height=0.1
 machine_nozzle_head_distance=3
 support_bottom_pattern=grid
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/061.settings b/stress_benchmark/resources/061.settings
index 3a05b93091..3a38d66ed6 100644
--- a/stress_benchmark/resources/061.settings
+++ b/stress_benchmark/resources/061.settings
@@ -610,7 +610,6 @@ machine_firmware_retract=False
 support_tree_angle=50
 support_tree_bp_diameter=7.5
 skirt_brim_speed=10.0
-support_interface_skip_height=0.16
 machine_nozzle_head_distance=3
 support_bottom_pattern=concentric
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/062.settings b/stress_benchmark/resources/062.settings
index d6c59d5fec..551408ec57 100644
--- a/stress_benchmark/resources/062.settings
+++ b/stress_benchmark/resources/062.settings
@@ -610,7 +610,6 @@ machine_firmware_retract=False
 support_tree_angle=50
 support_tree_bp_diameter=7.5
 skirt_brim_speed=30.0
-support_interface_skip_height=0.32
 machine_nozzle_head_distance=3
 support_bottom_pattern=concentric
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/063.settings b/stress_benchmark/resources/063.settings
index 4757dbfedc..5159f4aa2d 100644
--- a/stress_benchmark/resources/063.settings
+++ b/stress_benchmark/resources/063.settings
@@ -611,7 +611,6 @@ machine_firmware_retract=False
 support_tree_angle=50
 support_tree_bp_diameter=7.5
 skirt_brim_speed=75.0
-support_interface_skip_height=0.2
 machine_nozzle_head_distance=3
 support_bottom_pattern=concentric
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/064.settings b/stress_benchmark/resources/064.settings
index ad14e390a1..dd63525a1b 100644
--- a/stress_benchmark/resources/064.settings
+++ b/stress_benchmark/resources/064.settings
@@ -607,7 +607,6 @@ machine_firmware_retract=False
 support_tree_angle=60
 support_tree_bp_diameter=7.5
 skirt_brim_speed=30
-support_interface_skip_height=0.04
 machine_nozzle_head_distance=3
 support_bottom_pattern=grid
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/065.settings b/stress_benchmark/resources/065.settings
index e82e8ae600..b46931a14d 100644
--- a/stress_benchmark/resources/065.settings
+++ b/stress_benchmark/resources/065.settings
@@ -612,7 +612,6 @@ support_tree_angle=45
 skin_angles=[]
 support_tree_bp_diameter=7.5
 skirt_brim_speed=12.5
-support_interface_skip_height=0.1
 machine_nozzle_head_distance=3
 support_bottom_pattern=zigzag
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/066.settings b/stress_benchmark/resources/066.settings
index 3b324482ff..55941a9122 100644
--- a/stress_benchmark/resources/066.settings
+++ b/stress_benchmark/resources/066.settings
@@ -612,7 +612,6 @@ support_tree_angle=45
 skin_angles=[]
 support_tree_bp_diameter=7.5
 skirt_brim_speed=16.0
-support_interface_skip_height=0.1
 machine_nozzle_head_distance=3
 support_bottom_pattern=zigzag
 raft_base_wall_count=1
diff --git a/stress_benchmark/resources/067.settings b/stress_benchmark/resources/067.settings
index 8fead7495b..7e27cf4c68 100644
--- a/stress_benchmark/resources/067.settings
+++ b/stress_benchmark/resources/067.settings
@@ -610,7 +610,6 @@ support_tree_angle=38
 skin_angles=[45,135]
 support_tree_bp_diameter=7.5
 skirt_brim_speed=25.0
-support_interface_skip_height=0.28
 machine_nozzle_head_distance=3
 support_bottom_pattern=grid
 raft_base_wall_count=1
diff --git a/tests/test_global_settings.txt b/tests/test_global_settings.txt
index cb0c373c6a..839c6fe6ed 100644
--- a/tests/test_global_settings.txt
+++ b/tests/test_global_settings.txt
@@ -79,7 +79,6 @@ support_conical_angle=30
 speed_roofing=20
 anti_overhang_mesh=False
 meshfix_union_all_remove_holes=False
-support_interface_skip_height=0.3
 draft_shield_height=10
 top_thickness=1
 machine_endstop_positive_direction_y=False

From 279dab7027411bc7bad9cb5a93ae429ffd80f0df Mon Sep 17 00:00:00 2001
From: Remco Burema <r.burema@ultimaker.com>
Date: Wed, 10 Jan 2024 12:55:49 +0100
Subject: [PATCH 2/2] Completely remove skip layer counts.

This was redundant now that the setting is removed, and it's always set to 1.

part of CURA-11157
---
 include/TreeSupportSettings.h | 6 ------
 src/TreeSupport.cpp           | 9 ++-------
 src/support.cpp               | 6 ++----
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/include/TreeSupportSettings.h b/include/TreeSupportSettings.h
index 53075f7d9d..1fe47514ca 100644
--- a/include/TreeSupportSettings.h
+++ b/include/TreeSupportSettings.h
@@ -56,7 +56,6 @@ struct TreeSupportSettings
         , xy_min_distance(support_overrides == SupportDistPriority::Z_OVERRIDES_XY ? mesh_group_settings.get<coord_t>("support_xy_distance_overhang") : xy_distance)
         , z_distance_top_layers(round_up_divide(mesh_group_settings.get<coord_t>("support_top_distance"), layer_height))
         , z_distance_bottom_layers(round_up_divide(mesh_group_settings.get<coord_t>("support_bottom_distance"), layer_height))
-        , performance_interface_skip_layers(1UL)
         , support_infill_angles(mesh_group_settings.get<std::vector<AngleDegrees>>("support_infill_angles"))
         , support_roof_angles(mesh_group_settings.get<std::vector<AngleDegrees>>("support_roof_angles"))
         , roof_pattern(mesh_group_settings.get<EFillMethod>("support_roof_pattern"))
@@ -268,11 +267,6 @@ struct TreeSupportSettings
      */
     size_t z_distance_bottom_layers;
 
-    /*!
-     * \brief used for performance optimization at the support floor. Should have no impact on the resulting tree.
-     */
-    size_t performance_interface_skip_layers;
-
     /*!
      * \brief User specified angles for the support infill.
      */
diff --git a/src/TreeSupport.cpp b/src/TreeSupport.cpp
index 145fc64bf3..498bc850c3 100644
--- a/src/TreeSupport.cpp
+++ b/src/TreeSupport.cpp
@@ -69,10 +69,6 @@ TreeSupport::TreeSupport(const SliceDataStorage& storage)
             {
                 added = true;
                 grouped_mesh.second.emplace_back(mesh_idx);
-                // Handle some settings that are only used for performance reasons. This ensures that a horrible set setting intended to improve performance can not reduce it
-                // drastically.
-                grouped_mesh.first.performance_interface_skip_layers
-                    = std::min(grouped_mesh.first.performance_interface_skip_layers, next_settings.performance_interface_skip_layers);
             }
         }
         if (! added)
@@ -2206,8 +2202,7 @@ void TreeSupport::finalizeInterfaceAndSupportAreas(std::vector<Polygons>& suppor
                 size_t layers_below = 0;
                 while (layers_below <= config.support_bottom_layers)
                 {
-                    // One sample at 0 layers below, another at config.support_bottom_layers. In-between samples at config.performance_interface_skip_layers distance from each
-                    // other.
+                    // One sample at 0 layers below, another at config.support_bottom_layers. In-between samples at 1-layer distance from each other.
                     const size_t sample_layer
                         = static_cast<size_t>(std::max(0, (static_cast<int>(layer_idx) - static_cast<int>(layers_below)) - static_cast<int>(config.z_distance_bottom_layers)));
                     constexpr bool no_support = false;
@@ -2215,7 +2210,7 @@ void TreeSupport::finalizeInterfaceAndSupportAreas(std::vector<Polygons>& suppor
                     floor_layer.add(layer_outset.intersection(storage.getLayerOutlines(sample_layer, no_support, no_prime_tower)));
                     if (layers_below < config.support_bottom_layers)
                     {
-                        layers_below = std::min(layers_below + config.performance_interface_skip_layers, config.support_bottom_layers);
+                        layers_below = std::min(layers_below + 1UL, config.support_bottom_layers);
                     }
                     else
                     {
diff --git a/src/support.cpp b/src/support.cpp
index 3327f91dc2..b152e2fb66 100644
--- a/src/support.cpp
+++ b/src/support.cpp
@@ -1673,11 +1673,10 @@ void AreaSupport::generateSupportBottom(SliceDataStorage& storage, const SliceMe
         return;
     }
     const coord_t z_distance_bottom = round_up_divide(mesh.settings.get<coord_t>("support_bottom_distance"), layer_height); // Number of layers between support bottom and model.
-    const size_t skip_layer_count = 1UL; // Resolution of generating support bottoms above model.
     const coord_t bottom_line_width = mesh_group_settings.get<ExtruderTrain&>("support_bottom_extruder_nr").settings_.get<coord_t>("support_bottom_line_width");
     const coord_t bottom_outline_offset = mesh_group_settings.get<ExtruderTrain&>("support_bottom_extruder_nr").settings_.get<coord_t>("support_bottom_offset");
 
-    const size_t scan_count = std::max(size_t(1), (bottom_layer_count - 1) / skip_layer_count); // How many measurements to take to generate bottom areas.
+    const size_t scan_count = std::max(size_t(1), (bottom_layer_count - 1)); // How many measurements to take to generate bottom areas.
     const double z_skip = std::max(
         1.0,
         double(bottom_layer_count - 1) / double(scan_count)); // How many layers to skip between measurements. Using float for better spread, but this is later rounded.
@@ -1709,11 +1708,10 @@ void AreaSupport::generateSupportRoof(SliceDataStorage& storage, const SliceMesh
         return;
     }
     const coord_t z_distance_top = round_up_divide(mesh.settings.get<coord_t>("support_top_distance"), layer_height); // Number of layers between support roof and model.
-    const size_t skip_layer_count = 1UL; // Resolution of generating support roof below model.
     const coord_t roof_line_width = mesh_group_settings.get<ExtruderTrain&>("support_roof_extruder_nr").settings_.get<coord_t>("support_roof_line_width");
     const coord_t roof_outline_offset = mesh_group_settings.get<ExtruderTrain&>("support_roof_extruder_nr").settings_.get<coord_t>("support_roof_offset");
 
-    const size_t scan_count = std::max(size_t(1), (roof_layer_count - 1) / skip_layer_count); // How many measurements to take to generate roof areas.
+    const size_t scan_count = std::max(size_t(1), (roof_layer_count - 1)); // How many measurements to take to generate roof areas.
     const double z_skip = std::max(
         1.0,
         double(roof_layer_count - 1) / double(scan_count)); // How many layers to skip between measurements. Using float for better spread, but this is later rounded.