Merge remote-tracking branch 'upstream/master'

Merge remote-tracking branch 'upstream/master'

47 files changed, 47 insertions, 47 deletions

diff --git a/resources/quality/katihal/alya3dp_normal.inst.cfg b/resources/quality/katihal/alya3dp_normal.inst.cfg
index f5e2a02df1..6b19e9cb6d 100644
--- a/resources/quality/katihal/alya3dp_normal.inst.cfg
+++ b/resources/quality/katihal/alya3dp_normal.inst.cfg
@@ -44,7 +44,7 @@ support_top_distance = 0.15
 support_z_distance = 0.25
 support_bottom_distance = 0.15
 support_brim_width = 6
-support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15
+support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15
 support_line_distance = 1.7
 support_line_width = 0.25
 support_initial_layer_line_distance = 2.7
diff --git a/resources/quality/katihal/alyanx3dp_normal.inst.cfg b/resources/quality/katihal/alyanx3dp_normal.inst.cfg
index bb00f4da43..2263c26dd0 100644
--- a/resources/quality/katihal/alyanx3dp_normal.inst.cfg
+++ b/resources/quality/katihal/alyanx3dp_normal.inst.cfg
@@ -44,7 +44,7 @@ support_top_distance = 0.15
 support_z_distance = 0.25
 support_bottom_distance = 0.15
 support_brim_width = 6
-support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15
+support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15
 support_line_distance = 1.7
 support_line_width = 0.25
 support_initial_layer_line_distance = 2.7
diff --git a/resources/quality/katihal/kupido_normal.inst.cfg b/resources/quality/katihal/kupido_normal.inst.cfg
index e317749c79..65e84ba66c 100644
--- a/resources/quality/katihal/kupido_normal.inst.cfg
+++ b/resources/quality/katihal/kupido_normal.inst.cfg
@@ -44,7 +44,7 @@ support_top_distance = 0.15
 support_z_distance = 0.25
 support_bottom_distance = 0.15
 support_brim_width = 6
-support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15
+support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15
 support_line_distance = 1.7
 support_line_width = 0.25
 support_initial_layer_line_distance = 2.7
diff --git a/resources/quality/key3d/key3d_tyro_best.inst.cfg b/resources/quality/key3d/key3d_tyro_best.inst.cfg
index 50a989446a..82d3e0c35e 100644
--- a/resources/quality/key3d/key3d_tyro_best.inst.cfg
+++ b/resources/quality/key3d/key3d_tyro_best.inst.cfg
@@ -96,7 +96,7 @@ support_angle = 50
 support_pattern = grid
 support_wall_count = 0
 zig_zaggify_support = False
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_infill_angles = [0]
 support_brim_enable = True
 support_brim_line_count = 5
diff --git a/resources/quality/key3d/key3d_tyro_fast.inst.cfg b/resources/quality/key3d/key3d_tyro_fast.inst.cfg
index 5908c970c8..0d36b5a734 100644
--- a/resources/quality/key3d/key3d_tyro_fast.inst.cfg
+++ b/resources/quality/key3d/key3d_tyro_fast.inst.cfg
@@ -95,7 +95,7 @@ support_angle = 50
 support_pattern = grid
 support_wall_count = 0
 zig_zaggify_support = False
-support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15
+support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15
 support_infill_angles = [0]
 support_brim_enable = True
 support_brim_line_count = 5
diff --git a/resources/quality/key3d/key3d_tyro_normal.inst.cfg b/resources/quality/key3d/key3d_tyro_normal.inst.cfg
index a597f49798..cf31d10c4c 100644
--- a/resources/quality/key3d/key3d_tyro_normal.inst.cfg
+++ b/resources/quality/key3d/key3d_tyro_normal.inst.cfg
@@ -95,7 +95,7 @@ support_angle = 50
 support_pattern = grid
 support_wall_count = 0
 zig_zaggify_support = False
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_infill_angles = [0]
 support_brim_enable = True
 support_brim_line_count = 5
diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg
index 1fb088a157..4eb37a08ea 100644
--- a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg
+++ b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg
@@ -96,7 +96,7 @@ support_angle = 50
 support_pattern = grid
 support_wall_count = 0
 zig_zaggify_support = False
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_infill_angles = [0]
 support_brim_enable = True
 support_brim_line_count = 5
diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg
index 3d10a863a6..787a05a58a 100644
--- a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg
+++ b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg
@@ -92,7 +92,7 @@ support_angle = 50
 support_pattern = grid
 support_wall_count = 0
 zig_zaggify_support = False
-support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10
+support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10
 support_infill_angles = [0]
 support_brim_enable = True
 support_brim_line_count = 5
diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg
index 0f2dca2732..b1069c720b 100644
--- a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg
+++ b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg
@@ -96,7 +96,7 @@ support_angle = 50
 support_pattern = grid
 support_wall_count = 0
 zig_zaggify_support = False
-support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15
+support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15
 support_infill_angles = [0]
 support_brim_enable = True
 support_brim_line_count = 5
diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg
index d439050cc5..1f6defeded 100644
--- a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg
+++ b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg
@@ -95,7 +95,7 @@ support_angle = 50
 support_pattern = grid
 support_wall_count = 0
 zig_zaggify_support = False
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_infill_angles = [0]
 support_brim_enable = True
 support_brim_line_count = 5
diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg
index 7fc7cbe9ff..ac1ffa5756 100644
--- a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg
+++ b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg
@@ -94,7 +94,7 @@ support_angle = 50
 support_pattern = grid
 support_wall_count = 0
 zig_zaggify_support = False
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_infill_angles = [0]
 support_brim_enable = True
 support_brim_line_count = 5
diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg
index 8584d01f01..51d1cc8a7d 100644
--- a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg
+++ b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg
@@ -94,7 +94,7 @@ support_angle = 50
 support_pattern = grid
 support_wall_count = 0
 zig_zaggify_support = False
-support_infill_rate = =15 if support_enable else 0 if support_tree_enable else 15
+support_infill_rate = =15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15
 support_infill_angles = [0]
 support_brim_enable = True
 support_brim_line_count = 5
diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg
index 6416837c03..41d3da0b5c 100644
--- a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg
+++ b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg
@@ -94,7 +94,7 @@ support_angle = 50
 support_pattern = grid
 support_wall_count = 0
 zig_zaggify_support = False
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_infill_angles = [0]
 support_brim_enable = True
 support_brim_line_count = 5
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
index 1c883bb991..d95fee27bd 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
@@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.5
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
index 14b045176d..4566244ac5 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg
@@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 35)
 speed_wall_x = =math.ceil(speed_print * 30 / 35)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.5
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
index 291c08a74e..1d87ceda10 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
@@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_line_distance = 2.85
 support_pattern = lines
 support_xy_distance = 0.6
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
index a6e5b5f005..b4deb98a90 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg
@@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 35)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_line_distance = 2.85
 support_pattern = lines
 support_xy_distance = 0.6
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
index e45bdd6850..17a165b536 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
@@ -34,7 +34,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 25)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
index f11d0d6d9c..4f01753057 100644
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
@@ -34,7 +34,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30)
 speed_wall_x = =speed_print
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
index 1928387f81..b02baf975b 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
@@ -35,7 +35,7 @@ speed_travel = 150
 speed_wall_0 = =math.ceil(speed_print * 20 / 40)
 speed_wall_x = =speed_print
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
index 957a79363c..24af05ccff 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg
@@ -35,7 +35,7 @@ speed_travel = 150
 speed_wall_0 = =math.ceil(speed_print * 20 / 40)
 speed_wall_x = =speed_print
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
index c2d665077e..e3ab83a99d 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
@@ -34,7 +34,7 @@ speed_travel = 150
 speed_wall = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
index 6a15615cfe..75367a076c 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg
@@ -33,7 +33,7 @@ speed_travel = 150
 speed_wall = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
index 90750c53d4..7b3cab2194 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
@@ -38,7 +38,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
 support_bottom_distance = 0.55
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_top_distance = 0.55
 support_xy_distance = 0.7
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
index ebbfcbe990..41fa7f975b 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg
@@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 55)
 speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_xy_distance = 0.7
 support_z_distance = =layer_height * 2
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
index 0983ca3f88..a239cd4d4b 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
@@ -37,7 +37,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
 support_bottom_distance = 0.65
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_top_distance = 0.5
 support_xy_distance = 0.75
diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
index c8a8d58379..6e9da84593 100644
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
@@ -37,7 +37,7 @@ speed_wall_x = =math.ceil(speed_print * 40 / 55)
 support_angle = 45
 support_bottom_distance = 0.65
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_pattern = lines
 support_top_distance = 0.5
 support_xy_distance = 0.75
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
index db63dd1c7b..f41260d7b6 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
@@ -31,7 +31,7 @@ raft_surface_line_width = 0.2
 speed_layer_0 = =round(speed_print * 30 / 30)
 speed_print = 30
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.19
 wall_thickness = 0.88
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
index 4306f25bfd..0a5ee47618 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
@@ -31,7 +31,7 @@ raft_surface_line_width = 0.2
 speed_layer_0 = =round(speed_print * 30 / 30)
 speed_print = 30
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.19
 wall_thickness = 0.88
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
index 5b8e937883..81b54fc1e1 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
@@ -32,7 +32,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45)
 speed_wall_x = =math.ceil(speed_print * 30 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.19
 wall_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
index d795f4ee70..dd2652084d 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
@@ -32,7 +32,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 45)
 speed_wall_x = =math.ceil(speed_print * 30 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.19
 wall_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
index ab8838357e..3e44a277e0 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
@@ -36,7 +36,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45)
 speed_wall_x = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_line_distance = 3.5333
 support_pattern = lines
 support_z_distance = 0.21
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
index 21b9c3bf09..26db82487c 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg
@@ -36,7 +36,7 @@ speed_wall_0 = =math.ceil(speed_print * 30 / 45)
 speed_wall_x = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_line_distance = 3.5333
 support_pattern = lines
 support_z_distance = 0.21
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
index e2ad5a52ed..fbc9eea457 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
@@ -31,7 +31,7 @@ speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 2.0
diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
index c321b50435..5c2a49723c 100644
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
@@ -31,7 +31,7 @@ speed_layer_0 = =round(speed_print * 30 / 40)
 speed_print = 40
 support_angle = 45
 support_enable = True
-support_infill_rate = =20 if support_enable else 0 if support_tree_enable else 20
+support_infill_rate = =20 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 20
 support_pattern = lines
 support_z_distance = 0.26
 top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
index 080ec6a6fb..e7eaefaf1b 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
@@ -35,7 +35,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 40)
 speed_wall_x = =math.ceil(speed_print * 38 / 40)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_xy_distance = 0.6
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
index 37066bb371..676149c595 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg
@@ -33,7 +33,7 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 40)
 speed_wall_x = =math.ceil(speed_print * 35 / 40)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_xy_distance = 0.65
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
index 9ad54b3dbf..d5e0e130d1 100644
--- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
@@ -37,7 +37,7 @@ speed_wall_0 = =math.ceil(speed_print * 15 / 45)
 speed_wall_x = =math.ceil(speed_print * 40 / 45)
 support_angle = 45
 support_enable = True
-support_infill_rate = =25 if support_enable else 0 if support_tree_enable else 25
+support_infill_rate = =25 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 25
 support_xy_distance = 0.7
 support_z_distance = =layer_height * 2
 top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg
index 4e54892ddc..6afc7b234c 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg
@@ -37,4 +37,4 @@ support_angle = 45
 support_join_distance = 5
 support_offset = 2
 support_pattern = triangles
-support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10
+support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10
diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg
index 35ccc57089..5eea0599e2 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg
@@ -36,4 +36,4 @@ support_angle = 45
 support_join_distance = 5
 support_offset = 2
 support_pattern = triangles
-support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10
+support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10
diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg
index 22ad9c16c2..230b44eda7 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg
@@ -32,6 +32,6 @@ support_angle = 45
 support_join_distance = 5
 support_offset = 2
 support_pattern = triangles
-support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10
+support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10
 top_bottom_thickness = 1
 wall_thickness = 1
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg
index 51ed81c003..668f2b6168 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg
@@ -37,4 +37,4 @@ support_angle = 45
 support_join_distance = 5
 support_offset = 2
 support_pattern = triangles
-support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10
+support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg
index 75b353c1e1..a6612c39ff 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg
@@ -36,4 +36,4 @@ support_angle = 45
 support_join_distance = 5
 support_offset = 2
 support_pattern = triangles
-support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10
+support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg
index fdac81730c..8dc4cf7e67 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg
@@ -33,6 +33,6 @@ support_angle = 45
 support_join_distance = 5
 support_offset = 2
 support_pattern = triangles
-support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10
+support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10
 top_bottom_thickness = 1
 wall_thickness = 1
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg
index cc7e8aaa98..5a88d9fd35 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg
@@ -37,4 +37,4 @@ support_angle = 45
 support_join_distance = 5
 support_offset = 2
 support_pattern = triangles
-support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10
+support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg
index 8836231e41..cf92c54fdb 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg
@@ -36,4 +36,4 @@ support_angle = 45
 support_join_distance = 5
 support_offset = 2
 support_pattern = triangles
-support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10
+support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg
index 5d2cd669f6..5b696300c1 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg
@@ -33,6 +33,6 @@ support_angle = 45
 support_join_distance = 5
 support_offset = 2
 support_pattern = triangles
-support_infill_rate = =10 if support_enable else 0 if support_tree_enable else 10
+support_infill_rate = =10 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 10
 top_bottom_thickness = 1
 wall_thickness = 1