Merge branch 'main' into feature/texdisp-color-mixing

The "Mix by" combo main reworded is gone on this branch: ColorMixMode went with the per-triangle interleave. Kept its removal, with main's spelling for the line that stays, and updated the shader comments main added, which still described the interleave.
Colour only the faces the paint actually covered
2026-10-07 15:51:08 +00:00 · 2026-10-07 09:08:13 +02:00 · 2026-10-07 08:52:54 +02:00 · 2026-10-07 08:52:45 +02:00
54 changed files with 1494 additions and 970 deletions
@@ -105,12 +105,11 @@ Rules:
   `single_extruder_multi_material` off, and in the app when the printer tab loads a printer with a
   different number of extruders, the pair is rebuilt from `extruder_variant_list` (one
   `Direct Drive Standard` per extruder when the list is absent) and the variant arrays are resized to
-   the rebuilt pair, padded with their first value or cut. The `machine_max_*` limits are padded the
-   same way, so extruder 2 and up of a list-less printer take extruder 1's normal limit as their
-   silent one too. The resize skips `hotend_heating_rate` / `hotend_cooling_rate`: they keep their
-   width, and an extruder beyond it reads their first value. With the three in agreement that changes
-   nothing; a pair written without the list is replaced. A listed variant the pair lacks is a menu
-   choice that reads variant index 0.
+   the rebuilt pair, padded with their first value or cut. The resize skips the `machine_max_*` limits
+   and `hotend_heating_rate` / `hotend_cooling_rate`: they keep their width, and an extruder beyond it
+   reads their first value, so extruder 2 and up of a list-less printer take extruder 1's normal limit
+   as their silent one too. With the three in agreement that changes nothing; a pair written without
+   the list is replaced. A listed variant the pair lacks is a menu choice that reads variant index 0.
   - The pair without `extruder_variant_list` slices, but the sidebar offers no variant switch and
     the app cannot add variants to a list-less process: nothing is lost while every extruder
     has exactly one variant, and every further variant is unreachable.
@@ -295,6 +295,8 @@ src/slic3r/GUI/CAD/DesignSketchTool.cpp
 src/slic3r/GUI/CAD/SketchInlineEditor.cpp
 src/slic3r/GUI/CAD/DesignOffer.hpp
 src/slic3r/GUI/CAD/DesignTextDialog.cpp
+src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp
+src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp
 src/slic3r/GUI/KeyChord.cpp
 src/slic3r/GUI/Shortcuts.cpp
 src/libslic3r/CAD/CadDocument.cpp
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M5.5,14.5c-1.105,0-2-3.686-2-7s.895-7,2-7" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><line x1="8.67" y1="4.67" x2="14.33" y2="10.33" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round"/><line x1="14.33" y1="4.67" x2="8.67" y2="10.33" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round"/><path d="M3.5,13.7c-.294.511-.636.8-1,.8-1.1,0-2-3.686-2-7s.9-7,2-7c.365,0,.707.293,1,.805" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M6.727,4.5c.334-2.208,1-4,1.773-4,.354,0,.686.378.974,1" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M9.474,13.5c-.288.622-.62,1-.974,1-.77,0-1.439-1.792-1.773-4" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/></svg>
@@ -0,0 +1,4 @@
+<svg width="35" height="35" viewBox="0 0 35 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M17.0007 3.15607L5.26748 9.97446C5.0759 10.0857 4.8723 10.2988 4.71546 10.5713C4.55862 10.8438 4.47656 11.127 4.47656 11.349V24.4715C4.47656 24.6929 4.55879 24.9752 4.71606 25.2472C4.87328 25.5192 5.07737 25.7322 5.26956 25.8438L17.1143 32.6992C17.3061 32.8102 17.5904 32.8795 17.902 32.8782C18.2136 32.8768 18.4968 32.8049 18.6868 32.6927L30.2729 25.8523C30.4645 25.739 30.6677 25.524 30.8242 25.2501C30.9806 24.9761 31.0625 24.6919 31.0625 24.4693V11.2435C31.0625 11.0216 30.9805 10.7392 30.8238 10.4679C30.667 10.1966 30.4635 9.98491 30.2715 9.87455L18.582 3.15275C18.3912 3.04273 18.1054 2.97271 17.7915 2.97339C17.4777 2.97408 17.192 3.045 17.0007 3.15607ZM6.3957 11.3642C6.53284 11.1245 6.83831 11.0414 7.07799 11.1785L16.9733 16.8405C17.3553 17.0587 17.6738 17.4171 17.8953 17.7985C18.1169 18.1801 18.2703 18.6338 18.2717 19.0733L18.2893 30.4075C18.2897 30.6837 18.0662 30.9079 17.7901 30.9083C17.5139 30.9087 17.2897 30.6852 17.2893 30.4091L17.2717 19.0767C17.2708 18.8547 17.1879 18.5717 17.0305 18.3007C16.8729 18.0294 16.6691 17.8183 16.4776 17.709L6.58136 12.0465C6.34168 11.9093 6.25855 11.6039 6.3957 11.3642Z" fill="#4db6ac"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M19.0809 2.28613C18.7002 2.0665 18.2304 1.97243 17.7893 1.9734C17.3481 1.97436 16.8787 2.07053 16.4985 2.29133L4.76515 9.10978C4.38527 9.33044 4.06884 9.69007 3.84874 10.0725C3.6286 10.455 3.47656 10.9093 3.47656 11.349V24.4715C3.47656 24.9118 3.62953 25.3658 3.85033 25.7477C4.07118 26.1297 4.38804 26.4882 4.76735 26.7085L16.6135 33.5647C16.9954 33.7857 17.4651 33.8801 17.9064 33.8782C18.3475 33.8762 18.8161 33.7778 19.1954 33.5537L30.7814 26.7133C31.1591 26.4902 31.4737 26.1292 31.6925 25.746C31.9114 25.3627 32.0625 24.9084 32.0625 24.4693V11.2435C32.0625 10.8037 31.9104 10.3497 31.6896 9.96764C31.4689 9.58563 31.1515 9.22695 30.7698 9.00759L19.0809 2.28613ZM29.6625 11.8015C29.786 12.0485 29.6859 12.3489 29.4389 12.4723L20.3956 16.994C20.1486 17.1175 19.8483 17.0174 19.7248 16.7704C19.6013 16.5234 19.7014 16.2231 19.9484 16.0996L28.9917 11.5779C29.2387 11.4544 29.539 11.5545 29.6625 11.8015Z" fill="#bdbdbd"/>
+</svg>
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
+  <!-- Pencil body -->
+  <path d="M28.5 6.5l5 5L14 31l-5.5 1.5L10 27 28.5 6.5z" style="fill:#009688"/>
+  <!-- Pencil tip (dark) -->
+  <path d="M8.5 28.5l1.5 1.5 4.5-1L28.5 15l-3.5-3.5L8.5 28z" style="fill:#2b3436"/>
+  <!-- Pencil line -->
+  <line x1="10" y1="26" x2="25" y2="11" stroke="#2b3436" stroke-width="2"/>
+</svg>
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40">
+  <!-- Pencil body (dark mode colors) -->
+  <path d="M28.5 6.5l5 5L14 31l-5.5 1.5L10 27 28.5 6.5z" style="fill:#4db6ac"/>
+  <!-- Pencil tip -->
+  <path d="M8.5 28.5l1.5 1.5 4.5-1L28.5 15l-3.5-3.5L8.5 28z" style="fill:#e0e0e0"/>
+  <!-- Pencil line -->
+  <line x1="10" y1="26" x2="25" y2="11" stroke="#e0e0e0" stroke-width="2"/>
+</svg>
@@ -29,19 +29,13 @@ uniform vec3      palette_lab[64];
 uniform vec3      palette_rgb[64];
 uniform int       palette_count;
 uniform bool      pure_only;      // match against single filaments only (flat-colour image)
-// How each entry prints. A pure entry is one filament (a == b); a mix interleaves filaments a and b,
-// num parts of a in every den, and the print shows that interleave rather than the entry's average
-// colour. The fragment resolves it exactly as GLGizmoTextureDisplacement::make_mix_resolver() does
-// per triangle on the CPU, so the preview shows the pattern the bake will print.
+// How each entry prints. Every entry names a single filament: a mix is given its own mixed filament
+// slot, whose components the slicer alternates per print layer, so the fragment just looks that slot's
+// colour up.
 uniform int       palette_a[64];
 uniform int       palette_b[64];
-uniform int       palette_num[64];
-uniform int       palette_den[64];
 uniform vec3      filament_rgb[16];
 uniform int       filament_count;
-uniform int       mix_mode;     // ColorMixMode: 0 Z bands, 1 XY dither, 2 auto
-uniform float     layer_height; // mm; one Z band per print layer
-uniform float     dither_cell;  // mm; one XY dither cell
 uniform sampler2D color_tex;     // the layer's colour image, sampled at the same uv as the height
 uniform bool      has_color_tex;
 uniform bool volume_mirrored;
@@ -229,63 +223,16 @@ int nearest_palette_entry(vec3 rgb)
 }

 // One 2x2 Bayer cell, {0, 2; 3, 1}, for x and y in {0, 1}.
-float bayer2(float x, float y) { return 2.0 * x + 3.0 * y - 4.0 * x * y; }

-// The colour the printer lays down at world point `pos` for palette entry `index`: its filament, or
-// for a mix whichever of its two filaments this point falls on. Mirrors make_mix_resolver() on the
-// CPU, floors on the band/cell size included. All the modular arithmetic is done in floats with
-// mod(), which wraps negative coordinates the way the CPU's ((v % n) + n) % n does and needs no
-// integer % (not available on every GLSL 1.10 target).
-vec3 printed_color(int index, vec3 pos, vec3 normal, vec3 footprint)
+// The colour the printer lays down at world point `pos` for palette entry `index`. Every entry names a
+// single filament: a mix is given its own mixed filament slot, whose components the slicer alternates
+// per print layer, so there is nothing left to interleave here.
+vec3 printed_color(int index)
 {
    int a = palette_a[index];
-    int b = palette_b[index];
-    if (a < 0 || a >= filament_count || b < 0 || b >= filament_count)
+    if (a < 0 || a >= filament_count)
        return palette_rgb[index]; // no filament to resolve to: the entry's own colour
-    if (a == b)
-        return filament_rgb[a];
-    float num = float(palette_num[index]);
-    float den = float(palette_den[index]);
-    // Auto: bands where the surface is steeper than ~45 degrees, the dominant filament elsewhere.
-    if (mix_mode == 2 && abs(normal.z) >= 0.7)
-        return filament_rgb[(num * 2.0 >= den) ? a : b];
-
-    // Pre-filter. The interleave is an ordered dither the eye is meant to blend away, and no dither
-    // blends when it is drawn at less than a few pixels per period - it aliases, which is what turned
-    // every upright wall into horizontal streaks: the Z band cycle is den * layer_height (around a
-    // millimetre), and every pixel of a row on a vertical wall shares one z, so each row came out as a
-    // 1-bit threshold of the image at that row's phase. `footprint` is mm of world position per pixel,
-    // so this is zoom- and resolution-correct rather than a tuned constant: where the print's own
-    // pattern is finer than this view can resolve, show what the print looks like from here, which is
-    // the entry's perceptual average. The Normal view remains where the per-facet truth lives.
-    float period = (mix_mode == 1) ? 2.0 * max(dither_cell, 0.01) : den * max(layer_height, 0.01);
-    float px     = (mix_mode == 1) ? max(footprint.x, footprint.y) : footprint.z;
-    float sharp  = clamp(period / max(4.0 * px, 1e-6) - 0.5, 0.0, 1.0);
-    if (sharp <= 0.0)
-        return palette_rgb[index];
-
-    vec3 picked;
-    if (mix_mode == 1) {
-        // Ordered 4x4 Bayer over floor(x / cell), floor(y / cell). The CPU's table
-        //     0  8  2 10
-        //    12  4 14  6
-        //     3 11  1  9
-        //    15  7 13  5
-        // is 4 * bayer2(x % 2, y % 2) + bayer2(x / 2, y / 2), which needs no array (GLSL 1.10 has
-        // no constant arrays).
-        float cell  = max(dither_cell, 0.01);
-        float gx    = mod(floor(pos.x / cell), 4.0);
-        float gy    = mod(floor(pos.y / cell), 4.0);
-        float bayer = 4.0 * bayer2(mod(gx, 2.0), mod(gy, 2.0)) + bayer2(floor(gx / 2.0), floor(gy / 2.0));
-        picked = filament_rgb[(num / den > (bayer + 0.5) / 16.0) ? a : b];
-    } else {
-        // Z bands: one per band height, the band's phase in the a/b cycle picks the filament. Both
-        // operands are integer-valued, so the half keeps "phase < num" exact under float rounding.
-        float slot  = floor(pos.z / max(layer_height, 0.01));
-        float phase = mod(slot, den);
-        picked = filament_rgb[(phase < num - 0.5) ? a : b];
-    }
-    return mix(palette_rgb[index], picked, sharp);
+    return filament_rgb[a];
 }

 void main()
@@ -296,9 +243,6 @@ void main()
    // World millimetres throughout, like the bake - see the 140 variant.
    vec3 triangle_normal = normalize(cross(dFdx(world_pos.xyz), dFdy(world_pos.xyz)));
    vec3 tex_pos = world_pos.xyz - tex_anchor; // the frame the texture is projected in, as the bake does
-    // World mm per pixel, for pre-filtering the interleave in printed_color(). Taken here because the
-    // albedo branch at the end of main() is non-uniform control flow, where derivatives are undefined.
-    vec3 pos_fwidth = fwidth(world_pos.xyz);
    if (volume_mirrored)
        triangle_normal = -triangle_normal;

@@ -420,6 +364,6 @@ void main()
        // orientation and scale about the volume's origin, see texture_displacement_bake_frame()), so
        // measuring z from the bed instead shifted the band phase by the volume origin's height - a
        // different filament in the same place than the bake produces.
-        albedo = printed_color(nearest_palette_entry(texture2D(color_tex, color_uv).rgb), tex_pos, triangle_normal, pos_fwidth);
+        albedo = printed_color(nearest_palette_entry(texture2D(color_tex, color_uv).rgb));
    gl_FragColor = vec4(vec3(intensity.y) + albedo * intensity.x, uniform_color.a);
 }
@@ -88,19 +88,13 @@ uniform vec3      palette_lab[64];
 uniform vec3      palette_rgb[64];
 uniform int       palette_count;
 uniform bool      pure_only;      // match against single filaments only (flat-colour image)
-// How each entry prints. A pure entry is one filament (a == b); a mix interleaves filaments a and b,
-// num parts of a in every den, and the print shows that interleave rather than the entry's average
-// colour. The fragment resolves it exactly as GLGizmoTextureDisplacement::make_mix_resolver() does
-// per triangle on the CPU, so the preview shows the pattern the bake will print.
+// How each entry prints. Every entry names a single filament: a mix is given its own mixed filament
+// slot, whose components the slicer alternates per print layer, so the fragment just looks that slot's
+// colour up.
 uniform int       palette_a[64];
 uniform int       palette_b[64];
-uniform int       palette_num[64];
-uniform int       palette_den[64];
 uniform vec3      filament_rgb[16];
 uniform int       filament_count;
-uniform int       mix_mode;     // ColorMixMode: 0 Z bands, 1 XY dither, 2 auto
-uniform float     layer_height; // mm; one Z band per print layer
-uniform float     dither_cell;  // mm; one XY dither cell
 uniform sampler2D color_tex;     // the layer's colour image, sampled at the same uv as the height
 uniform bool      has_color_tex;
 uniform bool volume_mirrored;
@@ -295,63 +289,16 @@ int nearest_palette_entry(vec3 rgb)
 }

 // One 2x2 Bayer cell, {0, 2; 3, 1}, for x and y in {0, 1}.
-float bayer2(float x, float y) { return 2.0 * x + 3.0 * y - 4.0 * x * y; }

-// The colour the printer lays down at world point `pos` for palette entry `index`: its filament, or
-// for a mix whichever of its two filaments this point falls on. Mirrors make_mix_resolver() on the
-// CPU, floors on the band/cell size included. All the modular arithmetic is done in floats with
-// mod(), which wraps negative coordinates the way the CPU's ((v % n) + n) % n does and needs no
-// integer % (not available on every GLSL 1.10 target).
-vec3 printed_color(int index, vec3 pos, vec3 normal, vec3 footprint)
+// The colour the printer lays down at world point `pos` for palette entry `index`. Every entry names a
+// single filament: a mix is given its own mixed filament slot, whose components the slicer alternates
+// per print layer, so there is nothing left to interleave here.
+vec3 printed_color(int index)
 {
    int a = palette_a[index];
-    int b = palette_b[index];
-    if (a < 0 || a >= filament_count || b < 0 || b >= filament_count)
+    if (a < 0 || a >= filament_count)
        return palette_rgb[index]; // no filament to resolve to: the entry's own colour
-    if (a == b)
-        return filament_rgb[a];
-    float num = float(palette_num[index]);
-    float den = float(palette_den[index]);
-    // Auto: bands where the surface is steeper than ~45 degrees, the dominant filament elsewhere.
-    if (mix_mode == 2 && abs(normal.z) >= 0.7)
-        return filament_rgb[(num * 2.0 >= den) ? a : b];
-
-    // Pre-filter. The interleave is an ordered dither the eye is meant to blend away, and no dither
-    // blends when it is drawn at less than a few pixels per period - it aliases, which is what turned
-    // every upright wall into horizontal streaks: the Z band cycle is den * layer_height (around a
-    // millimetre), and every pixel of a row on a vertical wall shares one z, so each row came out as a
-    // 1-bit threshold of the image at that row's phase. `footprint` is mm of world position per pixel,
-    // so this is zoom- and resolution-correct rather than a tuned constant: where the print's own
-    // pattern is finer than this view can resolve, show what the print looks like from here, which is
-    // the entry's perceptual average. The Normal view remains where the per-facet truth lives.
-    float period = (mix_mode == 1) ? 2.0 * max(dither_cell, 0.01) : den * max(layer_height, 0.01);
-    float px     = (mix_mode == 1) ? max(footprint.x, footprint.y) : footprint.z;
-    float sharp  = clamp(period / max(4.0 * px, 1e-6) - 0.5, 0.0, 1.0);
-    if (sharp <= 0.0)
-        return palette_rgb[index];
-
-    vec3 picked;
-    if (mix_mode == 1) {
-        // Ordered 4x4 Bayer over floor(x / cell), floor(y / cell). The CPU's table
-        //     0  8  2 10
-        //    12  4 14  6
-        //     3 11  1  9
-        //    15  7 13  5
-        // is 4 * bayer2(x % 2, y % 2) + bayer2(x / 2, y / 2), which needs no array (GLSL 1.10 has
-        // no constant arrays).
-        float cell  = max(dither_cell, 0.01);
-        float gx    = mod(floor(pos.x / cell), 4.0);
-        float gy    = mod(floor(pos.y / cell), 4.0);
-        float bayer = 4.0 * bayer2(mod(gx, 2.0), mod(gy, 2.0)) + bayer2(floor(gx / 2.0), floor(gy / 2.0));
-        picked = filament_rgb[(num / den > (bayer + 0.5) / 16.0) ? a : b];
-    } else {
-        // Z bands: one per band height, the band's phase in the a/b cycle picks the filament. Both
-        // operands are integer-valued, so the half keeps "phase < num" exact under float rounding.
-        float slot  = floor(pos.z / max(layer_height, 0.01));
-        float phase = mod(slot, den);
-        picked = filament_rgb[(phase < num - 0.5) ? a : b];
-    }
-    return mix(palette_rgb[index], picked, sharp);
+    return filament_rgb[a];
 }

 void main()
@@ -364,9 +311,6 @@ void main()
    // world position and perturb the world normal.
    vec3 triangle_normal = normalize(cross(dFdx(world_pos.xyz), dFdy(world_pos.xyz)));
    vec3 tex_pos = world_pos.xyz - tex_anchor; // the frame the texture is projected in, as the bake does
-    // World mm per pixel, for pre-filtering the interleave in printed_color(). Taken here because the
-    // albedo branch at the end of main() is non-uniform control flow, where derivatives are undefined.
-    vec3 pos_fwidth = fwidth(world_pos.xyz);
    if (volume_mirrored)
        triangle_normal = -triangle_normal;

@@ -508,6 +452,6 @@ void main()
        // orientation and scale about the volume's origin, see texture_displacement_bake_frame()), so
        // measuring z from the bed instead shifted the band phase by the volume origin's height - a
        // different filament in the same place than the bake produces.
-        albedo = printed_color(nearest_palette_entry(texture(color_tex, color_uv).rgb), tex_pos, triangle_normal, pos_fwidth);
+        albedo = printed_color(nearest_palette_entry(texture(color_tex, color_uv).rgb));
    out_color = vec4(vec3(intensity.y) + albedo * intensity.x, uniform_color.a);
 }
@@ -311,7 +311,7 @@ function CreatePrinterBlock(OneModel)

 	return	'<div class="PrinterBlock" onClick="ChooseModel(\''+vendor+'\',\''+OneModel['model']+'\')">'+
 			'	<div class="PImg">'+
-			'		<img class="ModelThumbnail" src="' + OneModel['cover'] + '" onerror="this.onerror=null;this.src=\'../img/printer-dummy.png\';"/>'+
+			'		<img class="ModelThumbnail" src="' + OneModel['cover'] + '" />'+
 			'	</div>'+
 			'	<div class="PrinterInfoMark">?</div>'+
 			'	<div class="PrinterInfo">'+
@@ -23,13 +23,7 @@ appimage_is_host_library() {
 }

 appimage_is_elf_file() {
-    # Read the four-byte ELF magic rather than asking file(1): this runs once per candidate, and an
-    # AppDir holds thousands of them (the bundled Python runtime alone is ~5k files, none of them
-    # ELF). Two processes per call made this ~14 s of a ~95 s image build on its own.
-    local magic
-    [[ -f "$1" && -r "$1" ]] || return 1
-    IFS= read -r -n 4 -d '' magic < "$1" 2>/dev/null
-    [[ $magic == $'\177ELF' ]]
+    file -b "$1" 2>/dev/null | grep -q '^ELF '
 }

 appimage_list_direct_dependencies() {
@@ -4,10 +4,5 @@
 <dict>
    <key>com.apple.security.cs.disable-library-validation</key>
    <true/>
-    <!-- The Bambu network plug-in's code protector rewrites one of its own signed code pages
-         after loading. Under the hardened runtime macOS kills the process when that page is
-         paged back in; this lets it run, as Bambu Studio's signature does. -->
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
 </dict>
 </plist>
@@ -3618,9 +3618,6 @@ int CLI::run(int argc, char **argv)
                {
                    if (opt_key == "compatible_prints" || opt_key == "compatible_printers" || opt_key == "model_id" || opt_key == "dev_model_name" || opt_key == "filament_settings_id")
                        continue;
-                    // rebuilt from every filament after this loop
-                    if (filament_dev_options.find(opt_key) != filament_dev_options.end())
-                        continue;
                    ConfigOption *opt = m_print_config.option(opt_key, true);
                    if (opt == nullptr) {
                        // opt_key does not exist in this ConfigBase and it cannot be created, because it is not defined by this->def().
@@ -3684,14 +3681,6 @@ int CLI::run(int argc, char **argv)
            }
        }

-        // The stored values cannot be told apart per filament, so they are kept as they are unless every slot has a config.
-        std::vector<const DynamicPrintConfig *> filament_configs(filament_count, nullptr);
-        for (size_t index = 0; index < load_filaments_config.size(); index++)
-            if (load_filaments_index[index] >= 1 && load_filaments_index[index] <= filament_count)
-                filament_configs[load_filaments_index[index] - 1] = &load_filaments_config[index];
-        if (std::find(filament_configs.begin(), filament_configs.end(), nullptr) == filament_configs.end())
-            set_filament_dev_options(m_print_config, filament_configs);
-
        if (m_print_config.option<ConfigOptionStrings>("filament_extruder_variant")) {
            std::vector<int>& filament_self_indice = m_print_config.option<ConfigOptionInts>("filament_self_index", true)->values;
            int index_size = m_print_config.option<ConfigOptionStrings>("filament_extruder_variant")->size();
@@ -5,10 +5,5 @@
  <!-- for dynamic loading of libraries without signature validation. Used for 3dconnection drivers.-->
  <key>com.apple.security.cs.disable-library-validation</key>  
  <true/>
-  <!-- The Bambu network plug-in's code protector rewrites one of its own signed code pages
-       after loading. Under the hardened runtime macOS kills the process when that page is
-       paged back in; this lets it run, as Bambu Studio's signature does. -->
-  <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-  <true/>
 </dict>
 </plist>
@@ -118,13 +118,9 @@ bundle_dependency_closure() {
    # (scripts/check_appimage_libs.sh).
    local -a search_dirs=("$dst_dir")

-    # Walked with a read index rather than by reslicing the array: "${queue[@]:1}" rebuilds the whole
-    # queue on every pop, so draining it costs O(n^2). At the ~5k entries this bundle reaches that was
-    # ~22 s of the image build spent copying an array around.
-    local head=0
-    while [ "$head" -lt ${#queue[@]} ]; do
-        target="${queue[$head]}"
-        head=$((head + 1))
+    while [ ${#queue[@]} -gt 0 ]; do
+        target="${queue[0]}"
+        queue=("${queue[@]:1}")

        if [ ! -e "$target" ] || ! appimage_is_elf_file "$target"; then
            continue
@@ -62,7 +62,6 @@
 #include <TopoDS_Face.hxx>
 #include <TopAbs.hxx>
 #include <TopoDS_Shell.hxx>
-#include <TopoDS_Solid.hxx>
 #include <TopoDS_Compound.hxx>      // multi-body: compound of bodies for display/compat
 #include <BRep_Builder.hxx>
 #include <TopAbs_Orientation.hxx>   // outward-normal orientation for face-extrude
@@ -33,6 +33,7 @@
 #include <NCollection_IndexedMap.hxx>
 #include <NCollection_List.hxx>
 #include <Poly_Triangulation.hxx>
+#include <gp_Ax2.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Pnt.hxx>
 #include <BRepGProp.hxx>
@@ -52,7 +53,6 @@
 #include <BRepBuilderAPI_MakeSolid.hxx>
 #include <BRep_Builder.hxx>
 #include <TopoDS_Shell.hxx>
-#include <TopoDS_Solid.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <ShapeUpgrade_UnifySameDomain.hxx>
 #include <array>
@@ -244,6 +244,30 @@ TopoDS_Shape GeometryEngine::mesh_to_brep(const indexed_triangle_set& its,
    return shape;
 }

+// ---- Primitive creation ----
+
+TopoDS_Solid GeometryEngine::make_primitive(const PrimitiveParams& params)
+{
+    switch (params.type) {
+    case PrimitiveType::Box:
+        return BRepPrimAPI_MakeBox(gp_Pnt(-params.box_w/2, -params.box_d/2, 0),
+                                   params.box_w, params.box_d, params.box_h).Solid();
+    case PrimitiveType::Cylinder:
+        return BRepPrimAPI_MakeCylinder(gp_Ax2(gp_Pnt(0,0,0), gp_Dir(0,0,1)),
+                                        params.cyl_radius, params.cyl_height).Solid();
+    case PrimitiveType::Sphere:
+        return BRepPrimAPI_MakeSphere(gp_Pnt(0,0,params.sph_radius), params.sph_radius).Solid();
+    case PrimitiveType::Cone:
+        return BRepPrimAPI_MakeCone(gp_Ax2(gp_Pnt(0,0,0), gp_Dir(0,0,1)),
+                                    params.cone_r1, params.cone_r2, params.cone_height).Solid();
+    case PrimitiveType::Torus:
+        return BRepPrimAPI_MakeTorus(gp_Ax2(gp_Pnt(0,0,params.torus_r2), gp_Dir(0,0,1)),
+                                     params.torus_r1, params.torus_r2).Solid();
+    default:
+        return BRepPrimAPI_MakeBox(gp_Pnt(-10,-10,0), 20,20,20).Solid();
+    }
+}
+
 // ---- Face classification ----

 FaceGroup GeometryEngine::classify_face(const TopoDS_Face& face, const TopoDS_Shape& /*solid*/)
@@ -521,6 +545,19 @@ GeometryEngine::MassProps GeometryEngine::mass_properties(const TopoDS_Shape& sh
    return p;
 }

+std::string GeometryEngine::primitive_name(PrimitiveType type)
+{
+    switch (type) {
+    // TRN Default name of an object created from the box primitive shape.
+    case PrimitiveType::Box:      return _u8L("Box");
+    case PrimitiveType::Cylinder: return _u8L("Cylinder");
+    case PrimitiveType::Sphere:   return _u8L("Sphere");
+    case PrimitiveType::Cone:     return _u8L("Cone");
+    case PrimitiveType::Torus:    return _u8L("Torus");
+    default:                      return _u8L("Unknown");
+    }
+}
+
 // ---- Topology accessors ----

 int GeometryEngine::face_count(const TopoDS_Shape& shape)
@@ -4,8 +4,15 @@
 #include "libslic3r/Point.hpp"
 #include "libslic3r/TriangleMesh.hpp"

+#include <BRepPrimAPI_MakeBox.hxx>
+#include <BRepPrimAPI_MakeCylinder.hxx>
+#include <BRepPrimAPI_MakeSphere.hxx>
+#include <BRepPrimAPI_MakeCone.hxx>
+#include <BRepPrimAPI_MakeTorus.hxx>
 #include <TopoDS_Shape.hxx>
 #include <array>
+#include <gp_Ax2.hxx>
+#include <TopoDS_Solid.hxx>
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Edge.hxx>
 #include <vector>
@@ -13,11 +20,44 @@

 namespace Slic3r {

+enum class PrimitiveType { Box, Cylinder, Sphere, Cone, Torus, COUNT };
+enum class DressUpType   { Fillet, Chamfer };
 enum class FaceGroup     { Top, Bottom, Lateral, All };

+struct PrimitiveParams {
+    PrimitiveType type{PrimitiveType::Box};
+    double box_w{20}, box_h{20}, box_d{20};
+    double cyl_radius{10}, cyl_height{20};
+    double sph_radius{10};
+    double cone_r1{10}, cone_r2{5}, cone_height{20};
+    double torus_r1{10}, torus_r2{3};
+
+    // Dress-up
+    bool   dressup_enabled{false};
+    DressUpType dressup_type{DressUpType::Fillet};
+    FaceGroup   dressup_faces{FaceGroup::All};
+    double dressup_radius{1.0};    // fillet radius
+    double dressup_chamfer_dist{1.0}; // chamfer distance (symmetric)
+
+    // Mesh quality — the Design tab's own density (CadDocument::linear_deflection), so a
+    // primitive and the same body modelled in the Design tab reach the screen alike.
+    double linear_deflection{0.003};
+    double angular_deflection{0.5};
+
+    template<class Archive>
+    void serialize(Archive& ar) {
+        ar(type, box_w, box_h, box_d, cyl_radius, cyl_height, sph_radius,
+           cone_r1, cone_r2, cone_height, torus_r1, torus_r2,
+           dressup_enabled, dressup_type, dressup_faces, dressup_radius, dressup_chamfer_dist,
+           linear_deflection, angular_deflection);
+    }
+};
+
 class GeometryEngine
 {
 public:
+    static TopoDS_Solid make_primitive(const PrimitiveParams& params);
+
    // Read a STEP file into its top-level solids (one TopoDS_Shape per solid; falls back to
    // the whole shape if it contains no closed solids). Reuses OCCT's STEPControl_Reader,
    // already linked via Format/STEP.cpp — no new dependency. err is set on failure (empty result).
@@ -92,6 +132,7 @@ public:
    static TriangleMesh tessellate(const TopoDS_Shape& shape,
                                   double linear_deflection = 0.003,
                                   double angular_deflection = 0.5);
+    static std::string  primitive_name(PrimitiveType type);

    // Topology accessors for in-viewport face/edge picking (Design tab). Face index is the
    // TopExp_Explorer(shape, TopAbs_FACE) ordinal — identical to SketchEngine::tessellate's
@@ -3,6 +3,7 @@

 #include "libslic3r/TriangleMesh.hpp"
 #include "libslic3r/Point.hpp"
+#include "libslic3r/CAD/GeometryEngine.hpp"

 #include <gp_Pln.hxx>
 #include <gp_Ax1.hxx>
@@ -210,6 +211,30 @@ ConstraintPlan plan_entity_constraint(const std::vector<SketchEntity>& ents,
 bool solve_sketch_entities(std::vector<SketchEntity>& entities,
                           const std::vector<SketchEntityConstraintDef>& constraints);

+struct SketchParams {
+    // Extrude/Revolve
+    double extrude_len{10}; bool extrude_sym{false}; double extrude_taper{0};
+    double revolve_deg{360};
+    bool   is_pocket{false}; // cut into selected object instead of new
+
+    // Dress-up
+    bool        dressup_enabled{false};
+    DressUpType dressup_type{DressUpType::Fillet};
+    FaceGroup   dressup_faces{FaceGroup::All};
+    double      dressup_radius{1.0};
+    double      dressup_chamfer_dist{1.0};
+
+    // Mesh
+    double linear_deflection{0.01};
+
+    template<class Archive>
+    void serialize(Archive& ar) {
+        ar(extrude_len, extrude_sym, extrude_taper, revolve_deg, is_pocket,
+           dressup_enabled, dressup_type, dressup_faces, dressup_radius, dressup_chamfer_dist,
+           linear_deflection);
+    }
+};
+
 class SketchEngine
 {
 public:
@@ -10030,13 +10030,6 @@ static void extend_extruder_variant(DynamicPrintConfig& config, const unsigned i
            printer_extruder_variant_opt->values.insert(printer_extruder_variant_opt->values.end(), variants_list.begin(), variants_list.end());
        }
    }
-
-    // 3. Size the machine limits to the rebuilt variants, padded with their first value like the other variant keys.
-    // They are not extruder option keys, so the resize loop in set_num_extruders skips them.
-    const auto &defaults = FullPrintConfig::defaults();
-    for (const std::string &key : printer_options_with_variant_2)
-        if (auto *opt = config.option<ConfigOptionFloats>(key))
-            opt->resize(config.get_parameter_size(key, num_extruders), defaults.option(key));
 }

 void DynamicPrintConfig::set_num_extruders(unsigned int num_extruders)
@@ -10829,22 +10822,6 @@ void normalize_filament_values_to_variants(DynamicPrintConfig &config)
    }
 }

-void set_filament_dev_options(DynamicPrintConfig &config, const std::vector<const DynamicPrintConfig *> &filament_configs)
-{
-    for (const std::string &key : filament_dev_options) {
-        if (std::none_of(filament_configs.begin(), filament_configs.end(), [&key](const DynamicPrintConfig *filament) { return filament->has(key); }))
-            continue;
-        const ConfigOption *default_value = print_config_def.get(key)->default_value.get();
-        auto *dst = static_cast<ConfigOptionVectorBase *>(config.option(key, true));
-        dst->clear();
-        for (const DynamicPrintConfig *filament : filament_configs) {
-            const auto *src = static_cast<const ConfigOptionVectorBase *>(filament->has(key) ? filament->option(key) : default_value);
-            if (!src->empty())
-                dst->append(src);
-        }
-    }
-}
-

 //used for object/region config
 //use the smallest of multiple to single
@@ -11543,18 +11520,12 @@ void DynamicPrintConfig::update_non_diff_values_to_base_config(DynamicPrintConfi
    int cur_variant_count = cur_extruder_variants.size();
    int target_variant_count = target_extruder_variants.size();

-    // A base variant this config does not list (the base gained it after the config was saved, or the
-    // config lists none) takes this config's first variant of the same extruder, as a user preset's
-    // values do in update_diff_values_to_child_config. Left unmatched, the base's value would silently
-    // replace the user's.
    variant_index.resize(target_variant_count, -1);
    if (cur_variant_count == 0) {
        // Defensive: target_variant_count may be 0 if the preset doesn't carry extruder_variant_name.
        // In that case keep variant_index empty and let the downstream size checks produce a useful error.
        if (!variant_index.empty())
-            // This config's one value belongs to the extruder of the base's first variant.
-            variant_index = map_variant_indices(target_extruder_variants, target_extruder_ids, {},
-                                                target_extruder_ids.empty() ? std::vector<int>() : std::vector<int>{target_extruder_ids[0]});
+            variant_index[0] = 0;
    }
    else if ((cur_extruder_ids.size() > 0) && cur_variant_count != cur_extruder_ids.size()){
        //should not happen
@@ -11567,7 +11538,18 @@ void DynamicPrintConfig::update_non_diff_values_to_base_config(DynamicPrintConfi
             %extruder_variant_name %target_variant_count %extruder_id_name %target_extruder_ids.size();
    }
    else {
-        variant_index = map_variant_indices(target_extruder_variants, target_extruder_ids, cur_extruder_variants, cur_extruder_ids);
+        for (int i = 0; i < target_variant_count; i++)
+        {
+            for (int j = 0; j < cur_variant_count; j++)
+            {
+                if ((target_extruder_variants[i] == cur_extruder_variants[j])
+                    &&(target_extruder_ids.empty() || (target_extruder_ids[i] == cur_extruder_ids[j])))
+                {
+                    variant_index[i] = j;
+                    break;
+                }
+            }
+        }
    }

    for (auto& opt : keys) {
@@ -11592,13 +11574,6 @@ void DynamicPrintConfig::update_non_diff_values_to_base_config(DynamicPrintConfi
                    if (cur_variant_count > target_variant_count)
                        continue;

-                    // The variant lists are the base's layout itself, which every other value is
-                    // carried onto: a variant this config lacks keeps its own name and id.
-                    if (opt == extruder_id_name || opt == extruder_variant_name) {
-                        opt_src->set(opt_target);
-                        continue;
-                    }
-
                    int stride = 1;
                    if (key_set2.find(opt) != key_set2.end())
                        stride = 2;
@@ -928,11 +928,6 @@ void normalize_filament_values_to_variants(DynamicPrintConfig &config);

 extern std::set<std::string> filament_dev_options;

-// Orca: a filament_dev_options option holds several values per filament, and how many is up to the
-// filament preset, so one filament's values cannot be replaced in place. This rebuilds each option from
-// filament_configs, one config per filament in slot order, as the filaments' values one after another.
-void set_filament_dev_options(DynamicPrintConfig &config, const std::vector<const DynamicPrintConfig *> &filament_configs);
-
 extern void update_static_print_config_from_dynamic(ConfigBase& config, const DynamicPrintConfig& dest_config, std::vector<int> variant_index, std::set<std::string>& key_set1, int stride = 1);
 extern void compute_filament_override_value(const std::string& opt_key, const ConfigOption *opt_old_machine, const ConfigOption *opt_new_machine, const ConfigOption *opt_new_filament, const DynamicPrintConfig& new_full_config,
    t_config_option_keys& diff_keys, DynamicPrintConfig& filament_overrides, std::vector<int>& f_map_indices);
@@ -551,9 +551,13 @@ DecimateResult decimate(const TriSoup &geometry, size_t target_triangles, bool h

    // Rebuild from the surviving faces, with per-face normals.
    TriSoup &out = result.geometry;
+    if (!face_color.empty())
+        result.face_color.reserve(active_faces);
    for (size_t f = 0; f < face_count; ++f) {
        if (faces[f * 3] < 0)
            continue;
+        if (!face_color.empty())
+            result.face_color.push_back(f < face_color.size() ? face_color[f] : -1);
        const Vec3f a = pos[size_t(faces[f * 3])].cast<float>();
        const Vec3f b = pos[size_t(faces[f * 3 + 1])].cast<float>();
        const Vec3f c = pos[size_t(faces[f * 3 + 2])].cast<float>();
@@ -46,6 +46,13 @@ using DecimateProgressFn = std::function<bool(double fraction)>;
 struct DecimateResult
 {
    TriSoup geometry;
+    // One entry per output face, carried from the `face_color` handed in: a colour difference is a
+    // crease, so no collapse ever merges two faces of different colour and every survivor keeps exactly
+    // the colour it came with. Empty when no `face_color` was given.
+    //
+    // This is what lets the caller colour the simplified mesh by *provenance* rather than by sampling it
+    // again: the input colours were masked by the paint on the fine mesh, where that mask is exact.
+    std::vector<int> face_color;
    // The locked faces alone met the target, so it was unreachable without touching preserved
    // geometry.
    bool locked_over_budget = false;
@@ -42,7 +42,7 @@ TriSoup to_soup(const indexed_triangle_set &its, const std::vector<uint8_t> &fac
    return out;
 }

-indexed_triangle_set to_indexed_triangle_set(const TriSoup &soup)
+indexed_triangle_set to_indexed_triangle_set(const TriSoup &soup, std::vector<int> *face_color)
 {
    indexed_triangle_set out;
    const size_t         n = soup.pos.size();
@@ -54,12 +54,22 @@ indexed_triangle_set to_indexed_triangle_set(const TriSoup &soup)
        if (map.inserted())
            out.vertices.push_back(soup.pos[i]);
    }
+    const bool       track_color = face_color != nullptr && !face_color->empty();
+    std::vector<int> kept_color;
+    if (track_color)
+        kept_color.reserve(face_color->size());
    for (size_t t = 0; t + 2 < n; t += 3) {
        // Welded-together corners carry no area.
        if (id[t] == id[t + 1] || id[t + 1] == id[t + 2] || id[t] == id[t + 2])
            continue;
        out.indices.emplace_back(id[t], id[t + 1], id[t + 2]);
+        if (track_color) {
+            const size_t src = t / 3;
+            kept_color.push_back(src < face_color->size() ? (*face_color)[src] : -1);
+        }
    }
+    if (track_color)
+        *face_color = std::move(kept_color);
    return out;
 }

@@ -15,7 +15,10 @@ namespace TextureBake {
 TriSoup to_soup(const indexed_triangle_set &its, const std::vector<uint8_t> &face_excluded = {});

 // Welds at the geometry grid.
-indexed_triangle_set to_indexed_triangle_set(const TriSoup &soup);
+// `face_color`, when given, is read as one entry per soup triangle and rewritten to match the output.
+// Welding can leave a triangle with no area, and those are dropped here, so the two would otherwise
+// fall out of step.
+indexed_triangle_set to_indexed_triangle_set(const TriSoup &soup, std::vector<int> *face_color = nullptr);

 } // namespace TextureBake
 } // namespace Slic3r
@@ -290,6 +290,34 @@ PipelineResult run_pipeline(const TriSoup &input, const HeightSampleFn &sample,
        return result;
    }

+    // Colour per face, taken here and carried from here on. This is the only point where the paint mask
+    // is exact: `exclude_weight` says which faces the paint left out, and the mesh is still the refined
+    // one the displacement produced. Everything downstream (the collapse, the T-junction repair) carries
+    // these along rather than sampling again, and the caller uses them as they are.
+    //
+    // It also gives the collapse its crease criterion: an edge between two colours is never collapsed
+    // across, which is what keeps a survivor's colour well defined.
+    if (color_sample) {
+        const size_t nf = displaced.triangle_count();
+        result.face_color.assign(nf, -1);
+        const bool have_w = !displaced.exclude_weight.empty();
+        tbb::parallel_for(tbb::blocked_range<size_t>(0, nf), [&](const tbb::blocked_range<size_t> &r) {
+            for (size_t t = r.begin(); t < r.end(); ++t) {
+                // Unpainted faces take no colour at all, which is what stops the texture appearing on
+                // surfaces the paint never covered.
+                if (have_w && (displaced.exclude_weight[t * 3] + displaced.exclude_weight[t * 3 + 1] +
+                               displaced.exclude_weight[t * 3 + 2]) / 3.f > 0.99f)
+                    continue; // stays FACE_UNPAINTED
+                const Vec3f &a = displaced.pos[t * 3], &b = displaced.pos[t * 3 + 1], &c = displaced.pos[t * 3 + 2];
+                const int    sampled = color_sample((a + b + c) / 3.f, displaced.nrm[t * 3]);
+                // Painted either way. The sampler expects a point on the base surface and these are on
+                // the displaced one, so off the patch by more than its tolerance it simply says "no
+                // colour" - which must not be confused with "not painted".
+                result.face_color[t] = (sampled >= 0) ? sampled : FACE_NO_COLOUR;
+            }
+        });
+    }
+
    // 4. Decimate - export only. A bake needs the face-parent map, which a collapse destroys.
    std::vector<int>   parent                   = std::move(sub.face_parent_id);
    const size_t       displaced_before_decimate = displaced.triangle_count();
@@ -323,24 +351,8 @@ PipelineResult run_pipeline(const TriSoup &input, const HeightSampleFn &sample,
        // unless the budget was lowered until decimation had to run. Only collapses costing less than
        // harvest_tol are taken, so this does not reach the relief.
        const bool harvest_only = !over_budget && settings.harvest_flat && displaced.triangle_count() > 0;
+        std::vector<int> &face_color = result.face_color;
        if (over_budget || harvest_only) {
-            // Colour per face on the fine mesh, so colour boundaries become creases the collapse
-            // respects. Excluded (unpainted) faces take no colour.
-            std::vector<int> face_color;
-            if (color_sample) {
-                const size_t nf = displaced.triangle_count();
-                face_color.assign(nf, -1);
-                const bool have_w = !displaced.exclude_weight.empty();
-                tbb::parallel_for(tbb::blocked_range<size_t>(0, nf), [&](const tbb::blocked_range<size_t> &r) {
-                    for (size_t t = r.begin(); t < r.end(); ++t) {
-                        if (have_w && (displaced.exclude_weight[t * 3] + displaced.exclude_weight[t * 3 + 1] +
-                                       displaced.exclude_weight[t * 3 + 2]) / 3.f > 0.99f)
-                            continue;
-                        const Vec3f &a = displaced.pos[t * 3], &b = displaced.pos[t * 3 + 1], &c = displaced.pos[t * 3 + 2];
-                        face_color[t] = color_sample((a + b + c) / 3.f, displaced.nrm[t * 3]);
-                    }
-                });
-            }
            // Harvesting alone is asked for by handing it the count it already has: nothing is then
            // over the target, so the loop only ever pops collapses under the tolerance.
            const size_t before = displaced.triangle_count();
@@ -350,6 +362,7 @@ PipelineResult run_pipeline(const TriSoup &input, const HeightSampleFn &sample,
            result.locked_over_budget = dec.locked_over_budget;
            result.budget_limited     = result.simplified = dec.target_cost_detail;
            displaced                 = std::move(dec.geometry);
+            face_color                = std::move(dec.face_color);
            lap("decimate", displaced, over_budget ? "over budget, simplified" : "flat faces harvested");
            BOOST_LOG_TRIVIAL(info) << "TextureBake decimate: " << before << " -> " << displaced.triangle_count()
                                    << (over_budget ? " (budget " : " (flat harvest, budget ") << target << ")";
@@ -377,7 +390,7 @@ PipelineResult run_pipeline(const TriSoup &input, const HeightSampleFn &sample,

    // 6. Close the T-junctions decimation left behind. Only meaningful when it ran.
    if (mode == PipelineMode::Export && parent.empty()) {
-        displaced = resolve_t_junctions(displaced);
+        displaced = resolve_t_junctions(displaced, {}, &result.face_color);
        lap("repair", displaced);
    }

@@ -108,9 +108,27 @@ using PipelineProgressFn = std::function<bool(const char *stage, double fraction
 // colour-boundary creases. Only consulted when the mesh is over budget.
 using ColorSampleFn = std::function<int(const Vec3f &centroid, const Vec3f &normal)>;

+// Sentinels for PipelineResult::face_color.
+static constexpr int FACE_UNPAINTED = -1; // the paint did not cover this face's origin
+static constexpr int FACE_NO_COLOUR = -2; // painted, but the sampler returned nothing at this point
+
 struct PipelineResult
 {
    TriSoup geometry;
+    // One entry per output face, carried through decimation, the T-junction repair and the weld.
+    // FACE_UNPAINTED means the paint never covered the geometry this face came from; anything else means
+    // it did, and is the palette index `color_sample` returned there (FACE_NO_COLOUR when it returned
+    // none). The distinction matters: the sampler answers for points on the *base* surface, and these
+    // are sampled on the displaced one, so a painted face can easily come back without a colour. Only
+    // the painted/unpainted split is reliable here, and that is what a caller should use it for.
+    //
+    // Empty unless the caller gave a `color_sample`.
+    //
+    // A caller that needs per-face colour must use this rather than sampling the result again. The
+    // result is displaced geometry: a point on it is no longer where its base surface was, so matching
+    // it back by proximity colours whatever base surface happens to be nearest - which on a part thinner
+    // than the relief depth is the *opposite* face, picking up the texture meant for the painted one.
+    std::vector<int> face_color;
    // Output face -> input face. Empty in Export mode, where decimation invalidates it.
    std::vector<int> face_parent_id;
    bool             safety_cap_hit     = false;
@@ -72,7 +72,8 @@ size_t count_area_slivers(const TriSoup &geometry)
    return n;
 }

-TriSoup resolve_t_junctions(const TriSoup &geometry, const RepairOptions &opts)
+TriSoup resolve_t_junctions(const TriSoup &geometry, const RepairOptions &opts,
+                            std::vector<int> *face_color)
 {
    const size_t n_tri  = geometry.triangle_count();
    const double on_tol2 = opts.on_seg_tol * opts.on_seg_tol;
@@ -98,7 +99,12 @@ TriSoup resolve_t_junctions(const TriSoup &geometry, const RepairOptions &opts)
    // grid. A needle reads as watertight yet is deleted downstream, and dropping it leaves exactly
    // the on-edge-vertex topology the pass below closes.
    std::vector<std::array<int, 3>> faces;
+    // Parallel to `faces` throughout, so a split or a dropped degenerate keeps the two in step.
+    const bool       track_color = face_color != nullptr && !face_color->empty();
+    std::vector<int> colors;
    faces.reserve(n_tri);
+    if (track_color)
+        colors.reserve(n_tri);
    for (size_t t = 0; t < n_tri; ++t) {
        const int a = vid[t * 3], b = vid[t * 3 + 1], c = vid[t * 3 + 2];
        if (a == b || b == c || a == c)
@@ -108,6 +114,8 @@ TriSoup resolve_t_junctions(const TriSoup &geometry, const RepairOptions &opts)
        if (u.cross(w).squaredNorm() < DEGENERATE_AREA_SQ)
            continue;
        faces.push_back({ a, b, c });
+        if (track_color)
+            colors.push_back(t < face_color->size() ? (*face_color)[t] : -1);
    }

    for (int iter = 0; iter < opts.max_iters; ++iter) {
@@ -166,11 +174,16 @@ TriSoup resolve_t_junctions(const TriSoup &geometry, const RepairOptions &opts)
            break;

        std::vector<std::array<int, 3>> next;
+        std::vector<int>                next_colors;
        next.reserve(faces.size() + splits.size() * 2);
+        if (track_color)
+            next_colors.reserve(next.capacity());
        for (size_t fi = 0; fi < faces.size(); ++fi) {
            const auto it = splits.find(fi);
            if (it == splits.end()) {
                next.push_back(faces[fi]);
+                if (track_color)
+                    next_colors.push_back(colors[fi]);
                continue;
            }
            const auto &f  = faces[fi];
@@ -195,11 +208,18 @@ TriSoup resolve_t_junctions(const TriSoup &geometry, const RepairOptions &opts)
                seq.insert(seq.end(), sp.mids.rbegin(), sp.mids.rend());
                seq.push_back(sp.a);
            }
-            for (size_t s = 0; s + 1 < seq.size(); ++s)
+            for (size_t s = 0; s + 1 < seq.size(); ++s) {
                next.push_back({ seq[s], seq[s + 1], apex });
+                if (track_color)
+                    next_colors.push_back(colors[fi]); // every piece of a split face keeps its colour
+            }
        }
        faces.swap(next);
+        if (track_color)
+            colors.swap(next_colors);
    }
+    if (track_color)
+        *face_color = std::move(colors);

    TriSoup out;
    out.pos.reserve(faces.size() * 3);
@@ -43,7 +43,12 @@ struct RepairOptions
    int max_iters = 16;
 };

-TriSoup resolve_t_junctions(const TriSoup &geometry, const RepairOptions &opts = {});
+// `face_color`, when given, is read as one entry per input face and rewritten to match the output: a
+// face split to close a T-junction hands its colour to every piece, and a degenerate face dropped on
+// the way takes its entry with it. Without this the caller would have no way to keep a per-face colour
+// across this pass, which changes the triangle count.
+TriSoup resolve_t_junctions(const TriSoup &geometry, const RepairOptions &opts = {},
+                            std::vector<int> *face_color = nullptr);

 } // namespace TextureBake
 } // namespace Slic3r
@@ -2284,12 +2284,11 @@ indexed_triangle_set build_texture_displacement_v2(const indexed_triangle_set
    //
    // The *palette* index, not the printed filament. The decimation treats any edge whose two faces
    // differ as a crease (TextureBakeDecimate.cpp), so it must only ever see where the **perceived**
-    // colour changes - which is exactly what ColorResolveFn's own contract says the interleaving may
-    // never be fed into. Handing it the resolved filament made every Z band boundary a crease: on an
-    // upright wall that is one crease per band, so the collapse ran along those lines and left a stack
-    // of horizontal slivers, each printing in a single filament. Those were the horizontal colour
-    // lines in the baked result, and they also spent the triangle budget drawing a pattern the eye is
-    // meant to blend away. Faces the paint excludes are skipped by the pipeline itself.
+    // colour changes. A mix is one perceived colour however its components are laid down, which is why
+    // it has to be the palette index here: back when this was handed a per-triangle interleave instead,
+    // every band boundary read as a crease, the collapse ran along those lines and left a stack of
+    // horizontal slivers, and the triangle budget went on drawing a pattern the eye is meant to blend
+    // away. Faces the paint excludes are skipped by the pipeline itself.
    const TextureBake::ColorSampleFn color_sample =
        color_sampler ? TextureBake::ColorSampleFn([&color_sampler](const Vec3f &p, const Vec3f &n) {
                            return color_sampler(p, n);
@@ -2315,7 +2314,7 @@ indexed_triangle_set build_texture_displacement_v2(const indexed_triangle_set
        stats->triangles_budget  = result.triangles_budget;
        stats->budget_limited    = result.budget_limited;
    }
-    indexed_triangle_set out = TextureBake::to_indexed_triangle_set(result.geometry);
+    indexed_triangle_set out = TextureBake::to_indexed_triangle_set(result.geometry, &result.face_color);
    if (out.indices.empty())
        return mesh;
    if (flip_normals)
@@ -2336,6 +2335,8 @@ indexed_triangle_set build_texture_displacement_v2(const indexed_triangle_set
                max_depth = std::max(max_depth, std::abs(layer.depth_mm));
            const float relief_tol = max_depth + paint_tol;
            std::vector<int> palette(out.indices.size(), -1);
+            const std::vector<int> &face_mask      = result.face_color;
+            const bool              have_face_mask = face_mask.size() == out.indices.size();
            tbb::parallel_for(tbb::blocked_range<size_t>(0, out.indices.size()), [&](const tbb::blocked_range<size_t> &r) {
                for (size_t i = r.begin(); i < r.end(); ++i) {
                    const stl_triangle_vertex_indices &t = out.indices[i];
@@ -2351,8 +2352,19 @@ indexed_triangle_set build_texture_displacement_v2(const indexed_triangle_set
                    // reason; this path was the inconsistent one.
                    Vec3f       foot = centroid, base_n = Vec3f::UnitZ();
                    const float d2   = painted_closest(centroid, &foot, &base_n);
-                    if (!all_painted && d2 >= relief_tol * relief_tol)
+                    // Which faces may be coloured comes from the pipeline, which recorded it on the
+                    // refined mesh where the paint mask is exact, and carried it through the collapse,
+                    // the T-junction repair and the weld. Proximity cannot answer this: a displaced face
+                    // is no longer where its base was, so on a part thinner than the relief depth the
+                    // nearest painted surface to the *opposite* face is the painted one, and the texture
+                    // appeared there too. Only the position to sample at still comes from the base
+                    // surface, for the projection reason above.
+                    if (have_face_mask) {
+                        if (face_mask[i] == TextureBake::FACE_UNPAINTED)
+                            continue;
+                    } else if (!all_painted && d2 >= relief_tol * relief_tol) {
                        continue;
+                    }
                    palette[i] = sampler(foot, base_n);
                }
            });
@@ -2374,7 +2386,7 @@ indexed_triangle_set build_texture_displacement_v2(const indexed_triangle_set
                Vec3f        normal   = (b - a).cross(c - a);
                const float  nl       = normal.norm();
                normal                = (nl > 0.f) ? Vec3f(normal / nl) : Vec3f::UnitZ();
-                const int filament = color->resolve ? color->resolve(palette[i], centroid, normal) : palette[i];
+                const int filament = palette[i];
                if (filament >= 0)
                    out_color[i] = uint8_t(std::min(filament + 1, 255));
            }
@@ -2831,8 +2843,7 @@ static indexed_triangle_set build_texture_displacement_in_place(
            Vec3f        normal   = (b - a).cross(c - a);
            const float  nl       = normal.norm();
            normal                = (nl > 0.f) ? Vec3f(normal / nl) : Vec3f::UnitZ();
-            const int filament = color->resolve ? color->resolve(triangle_palette[i], centroid, normal)
-                                                : triangle_palette[i];
+            const int filament = triangle_palette[i];
            if (filament >= 0)
                out_color[i] = uint8_t(std::min(filament + 1, 255));
        }
@@ -321,25 +321,6 @@ struct TextureDisplacementLayer
    }
 };

-// How a *mixed* palette entry - one that names two filaments rather than one - is turned into real
-// per-facet paint. An MMU extrudes one filament at a time, so an intermediate colour exists only by
-// interleaving two of them finely enough that the eye does the blending.
-enum class ColorMixMode : int
-{
-    // Horizontal bands: which of the two filaments a point takes depends on its height, so
-    // consecutive print layers alternate. This is how filament-blend prints actually work, and on a
-    // vertical-ish surface it reads as a genuinely smooth colour. On a near-horizontal surface a whole
-    // layer is one band, so the blend disappears - that is what XYDither is for.
-    ZBands   = 0,
-    // An ordered (Bayer) checkerboard across the surface, at any orientation. Independent of layer
-    // height, but its cell is around the size of one facet, so a fine mix can read as texture rather
-    // than as a clean blend.
-    XYDither = 1,
-    // Per triangle, by its orientation: bands where the surface is upright enough for consecutive
-    // layers to alternate, the checkerboard where it faces up or down and a layer would be one band.
-    // The default - a flat-topped part with a mix on top gets no blend at all from bands alone.
-    Auto     = 2,
-};

 // Settings that apply to the whole layer stack rather than to one layer, held per ModelVolume next
 // to texture_displacement_layers and consumed by build_texture_displacement().
@@ -406,7 +387,6 @@ struct TextureDisplacementOptions
    // image (TextureDetail::flat_colors): a texture of flat colours prints in single filaments, a
    // photograph or gradient in mixes. Off forces single filaments everywhere.
    bool         color_mix_enabled = true;
-    ColorMixMode color_mix_mode    = ColorMixMode::Auto;
    // Majority-filter passes over the assigned colours. See TextureColorRequest::despeckle_passes -
    // this is the control for it, and 2 is enough to clear the salt-and-pepper an image with detail
    // finer than the mesh leaves behind, without eating features that are genuinely a facet wide.
@@ -414,11 +394,9 @@ struct TextureDisplacementOptions

    template<class Archive> void serialize(Archive &ar)
    {
-        int mix_mode = int(color_mix_mode);
        ar(displace_border, smooth_enabled, smooth_strength, smooth_iterations, smooth_skip_border,
           pipeline_v2, v2_refine_mm, v2_regularize, v2_max_triangles_k,
-           v2_relocate, color_mix_enabled, mix_mode, color_despeckle);
-        color_mix_mode = ColorMixMode(mix_mode);
+           v2_relocate, color_mix_enabled, color_despeckle);
    }
 };

@@ -511,17 +489,9 @@ DecodedHeightTexture decode_height_texture(const TextureDisplacementLayer &layer
 // is. See GLGizmoTextureDisplacement::make_palette_quantizer().
 using ColorQuantizeFn = std::function<int(const Vec3f &)>;

-// Resolves a palette index plus a surface position to the filament index that position should print
-// in. A pure entry ignores the position; a mixed one interleaves its two filaments per ColorMixMode.
-//
-// Deliberately separate from ColorQuantizeFn, and deliberately *not* used by the subdivision's colour
-// criterion: that criterion asks where the **perceived** colour changes, and must not see the
-// interleaving. Refining on every band or dither-cell boundary would spend the whole triangle budget
-// drawing a pattern the eye is supposed to blend away.
-using ColorResolveFn = std::function<int(int palette_index, const Vec3f &pos, const Vec3f &normal)>;

 // One printable colour: either a loaded filament on its own, or a blend of two of them realised by
-// interleaving (see ColorMixMode). Plain data, so it can be captured into a background job.
+// interleaving, which the slicer does per print layer. Plain data, so it can be captured into a job.
 struct PrintableColor
 {
    Vec3f rgb   = Vec3f::Zero(); // what it looks like; for a mix, the perceptual average of the two
@@ -538,9 +508,6 @@ struct TextureColorSettings
 {
    std::vector<PrintableColor> palette;
    std::vector<PrintableColor> palette_pure; // the filaments alone, for flat-colour images
-    ColorMixMode                mix_mode         = ColorMixMode::ZBands;
-    float                       layer_height     = 0.2f; // sizes the Z bands
-    float                       dither_cell_mm   = 0.4f; // sizes the XY dither cells
    int                         despeckle_passes = 2;

    bool empty() const { return palette.empty(); }
@@ -780,9 +747,6 @@ struct TextureColorRequest
    // made of flat colours (TextureDetail::flat_colors) is matched with this one, so a tile or a logo
    // prints in single filaments while a photograph on another layer may still use mixes.
    ColorQuantizeFn quantize_pure;
-    // Palette index + position -> filament. Optional: without it a palette index is taken to be a
-    // filament index directly, which is the no-mixing case.
-    ColorResolveFn  resolve;
    // Majority-filter passes over the *perceived* colour, before any interleaving is resolved.
    //
    // Sampling a detailed image once per triangle leaves salt-and-pepper wherever the image's own
@@ -849,6 +849,11 @@ if (SLIC3R_CAD)
        GUI/CAD/SketchInlineEditor.hpp
        GUI/CAD/McpControl.cpp
        GUI/CAD/McpControl.hpp
+        GUI/Gizmos/GLGizmoSketch.cpp
+        GUI/Gizmos/GLGizmoSketch.hpp
+        # Needs GeometryEngine (make_primitive / apply_fillet / tessellate).
+        GUI/Gizmos/GLGizmoPrimitive.cpp
+        GUI/Gizmos/GLGizmoPrimitive.hpp
    )
 endif ()

@@ -0,0 +1,206 @@
+#include "GLGizmoPrimitive.hpp"
+#include "slic3r/GUI/GLCanvas3D.hpp"
+#include "slic3r/GUI/ImGuiWrapper.hpp"
+#include "slic3r/GUI/Plater.hpp"
+#include "slic3r/GUI/NotificationManager.hpp"
+#include "libslic3r/Model.hpp"
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
+#include "libslic3r/CAD/GeometryEngine.hpp"
+#include <TopoDS_Solid.hxx>
+#include <TopoDS_Shape.hxx>
+#include "slic3r/GUI/GUI_App.hpp"
+#include <utility>
+#include <algorithm>
+#include <imgui.h>
+
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
+#include <imgui/imgui_internal.h>
+#include "libslic3r/TriangleMesh.hpp"
+#include "slic3r/GUI/I18N.hpp"
+
+namespace Slic3r {
+namespace GUI {
+
+GLGizmoPrimitive::GLGizmoPrimitive(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id)
+    : GLGizmoBase(parent, icon_filename, sprite_id) {}
+
+bool GLGizmoPrimitive::on_init() { return true; }
+std::string GLGizmoPrimitive::on_get_name() const { return _u8L("Primitive"); }
+// Part of the experimental CAD feature: built into every CAD build, but offered in the Prepare
+// toolbar only when that feature is switched on in Preferences — switched off, Prepare must be
+// exactly what it is without it.
+bool GLGizmoPrimitive::on_is_activable() const { return wxGetApp().is_enable_cad_feature(); }
+bool GLGizmoPrimitive::on_is_selectable() const { return wxGetApp().is_enable_cad_feature(); }
+void GLGizmoPrimitive::on_render() {}
+void GLGizmoPrimitive::on_set_state()
+{ if (m_state == EState::On) { m_params = PrimitiveParams{}; m_preview_dirty = true; } }
+
+bool GLGizmoPrimitive::on_mouse(const wxMouseEvent&) { return false; }
+
+CommonGizmosDataID GLGizmoPrimitive::on_get_requirements() const
+{ return CommonGizmosDataID(int(CommonGizmosDataID::SelectionInfo) | int(CommonGizmosDataID::InstancesHider)); }
+
+void GLGizmoPrimitive::on_load(cereal::BinaryInputArchive& ar)
+{ ar(m_params); m_preview_dirty = true; }
+void GLGizmoPrimitive::on_save(cereal::BinaryOutputArchive& ar) const
+{ ar(m_params); }
+
+void GLGizmoPrimitive::apply_preset(const char*, double w, double h, double d)
+{
+    m_params.type = PrimitiveType::Box;
+    m_params.box_w = w; m_params.box_h = h; m_params.box_d = d;
+    m_preview_dirty = true;
+}
+
+static void gen_mesh_and_add(PrimitiveParams& p, const char* snap_name)
+{
+    TopoDS_Solid solid = GeometryEngine::make_primitive(p);
+    TopoDS_Shape shape = solid;
+    if (p.dressup_enabled) {
+        if (p.dressup_type == DressUpType::Fillet)
+            shape = GeometryEngine::apply_fillet(shape, p.dressup_radius, p.dressup_faces);
+        else
+            shape = GeometryEngine::apply_chamfer(shape, p.dressup_chamfer_dist, p.dressup_faces);
+    }
+    TriangleMesh mesh = GeometryEngine::tessellate(shape, p.linear_deflection, p.angular_deflection);
+    if (mesh.its.indices.empty()) {
+        wxGetApp().notification_manager()->push_notification(NotificationType::CustomNotification, NotificationManager::NotificationLevel::WarningNotificationLevel, _u8L("Empty mesh generated"));
+        return;
+    }
+    wxGetApp().plater()->take_snapshot(snap_name);
+    ModelObject* mo = wxGetApp().model().add_object();
+    std::string name = GeometryEngine::primitive_name(p.type);
+    if (p.dressup_enabled && p.dressup_type == DressUpType::Fillet) name += " (Fillet)";
+    else if (p.dressup_enabled) name += " (Chamfer)";
+    mo->name = name;
+    mo->add_volume(std::move(mesh))->set_new_unique_id();
+    mo->ensure_on_bed();
+    wxGetApp().plater()->update();
+}
+
+void GLGizmoPrimitive::apply_primitive() { gen_mesh_and_add(m_params, "Add Primitive"); }
+
+void GLGizmoPrimitive::on_render_input_window(float x, float y, float bottom_limit)
+{
+    y = std::min(y, bottom_limit - ImGui::GetWindowHeight());
+    const float scale = m_parent.get_scale();
+    ImGuiWrapper::push_toolbar_style(scale);
+    GizmoImguiSetNextWIndowPos(x, y, ImGuiCond_Always, 0.0f, 0.0f);
+    GizmoImguiBegin("Primitive", ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove
+                                  | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse
+                                  | ImGuiWindowFlags_NoTitleBar);
+
+    if (ImGui::CollapsingHeader(_u8L("Shape").c_str(), ImGuiTreeNodeFlags_DefaultOpen)) {
+        const std::string names_s[] = {_u8L("Box"), _u8L("Cylinder"), _u8L("Sphere"), _u8L("Cone"), _u8L("Torus")};
+        const char* names[] = {names_s[0].c_str(), names_s[1].c_str(), names_s[2].c_str(), names_s[3].c_str(), names_s[4].c_str()};
+        int cur = (int)m_params.type;
+        if (ImGui::Combo("##type", &cur, names, (int)PrimitiveType::COUNT)) {
+            m_params.type = (PrimitiveType)cur;
+            m_preview_dirty = true;
+        }
+        // TRN Primitive gizmo: label in front of the preset cube size buttons
+        ImGui::TextUnformatted(_u8L("Quick:").c_str());
+        ImGui::SameLine();
+        if (ImGui::SmallButton("10mm")) apply_preset("10mm cube", 10, 10, 10);
+        ImGui::SameLine();
+        if (ImGui::SmallButton("20mm")) apply_preset("20mm cube", 20, 20, 20);
+        ImGui::SameLine();
+        if (ImGui::SmallButton("50mm")) apply_preset("50mm cube", 50, 50, 50);
+    }
+
+    ImGui::Separator();
+
+    if (ImGui::CollapsingHeader(_u8L("Dimensions").c_str(), ImGuiTreeNodeFlags_DefaultOpen)) {
+        auto dim = [&](const char* label, double& val, double step=0.5, double fast=5.0) {
+            ImGui::SetNextItemWidth(130);
+            if (ImGui::InputDouble(label, &val, step, fast, "%.1f mm")) m_preview_dirty = true;
+            if (val < 0.5) val = 0.5;
+        };
+        switch (m_params.type) {
+        case PrimitiveType::Box:
+            dim(_u8L("Width (X)").c_str(),  m_params.box_w);
+            dim(_u8L("Depth (Y)").c_str(),  m_params.box_d);
+            dim(_u8L("Height (Z)").c_str(), m_params.box_h);
+            break;
+        case PrimitiveType::Cylinder:
+            dim(_u8L("Radius").c_str(), m_params.cyl_radius);
+            dim(_u8L("Height").c_str(), m_params.cyl_height);
+            break;
+        case PrimitiveType::Sphere:
+            dim(_u8L("Radius").c_str(), m_params.sph_radius);
+            break;
+        case PrimitiveType::Cone:
+            // TRN Primitive gizmo: bottom radius of a cone ("Top R" is the top radius)
+            dim(_u8L("Bottom R").c_str(), m_params.cone_r1);
+            dim(_u8L("Top R").c_str(),    m_params.cone_r2);
+            dim(_u8L("Height").c_str(),   m_params.cone_height);
+            break;
+        case PrimitiveType::Torus:
+            // TRN Primitive gizmo: major radius of a torus ("Minor R" is the tube radius)
+            dim(_u8L("Major R").c_str(), m_params.torus_r1);
+            dim(_u8L("Minor R").c_str(), m_params.torus_r2, 0.1, 1.0);
+            break;
+        default: break;
+        }
+    }
+
+    ImGui::Separator();
+
+    if (ImGui::CollapsingHeader(_u8L("Fillet / Chamfer").c_str())) {
+        ImGui::Checkbox(_u8L("Enable").c_str(), &m_params.dressup_enabled);
+        if (m_params.dressup_enabled) {
+            const std::string dn_s[] = {_u8L("Fillet"), _u8L("Chamfer")};
+            const char* dn[] = {dn_s[0].c_str(), dn_s[1].c_str()};
+            int du = (int)m_params.dressup_type;
+            ImGui::SetNextItemWidth(100);
+            if (ImGui::Combo("##dtype", &du, dn, 2)) { m_params.dressup_type = (DressUpType)du; m_preview_dirty = true; }
+            const std::string fn_s[] = {_u8L("All edges"), _u8L("Top edges"), _u8L("Bottom edges"), _u8L("Lateral edges")};
+            const char* fn[] = {fn_s[0].c_str(), fn_s[1].c_str(), fn_s[2].c_str(), fn_s[3].c_str()};
+            int fg = (int)m_params.dressup_faces;
+            ImGui::SetNextItemWidth(140);
+            if (ImGui::Combo(_u8L("Edges").c_str(), &fg, fn, 4)) { m_params.dressup_faces = (FaceGroup)fg; m_preview_dirty = true; }
+            if (m_params.dressup_type == DressUpType::Fillet) {
+                ImGui::SetNextItemWidth(100);
+                if (ImGui::InputDouble(_u8L("Radius").c_str(), &m_params.dressup_radius, 0.1, 1.0, "%.1f mm")) {
+                    if (m_params.dressup_radius < 0.1) m_params.dressup_radius = 0.1;
+                    m_preview_dirty = true;
+                }
+            } else {
+                ImGui::SetNextItemWidth(100);
+                if (ImGui::InputDouble(_u8L("Distance").c_str(), &m_params.dressup_chamfer_dist, 0.1, 1.0, "%.1f mm")) {
+                    if (m_params.dressup_chamfer_dist < 0.1) m_params.dressup_chamfer_dist = 0.1;
+                    m_preview_dirty = true;
+                }
+            }
+        }
+    }
+
+    ImGui::Separator();
+
+    if (ImGui::CollapsingHeader(_u8L("Quality").c_str())) {
+        ImGui::SetNextItemWidth(130);
+        if (ImGui::InputDouble(_u8L("Mesh resolution").c_str(), &m_params.linear_deflection, 0.001, 0.1, "%.3f mm")) {
+            if (m_params.linear_deflection < 0.001) m_params.linear_deflection = 0.001;
+            if (m_params.linear_deflection > 1.0)   m_params.linear_deflection = 1.0;
+            m_preview_dirty = true;
+        }
+    }
+
+    ImGui::Separator();
+
+    if (ImGui::Button(_u8L("Add Shape").c_str(), {-1, 28}))
+        apply_primitive();
+
+    if (ImGui::Button(_u8L("Close").c_str(), {-1, 0}))
+        m_parent.reset_all_gizmos();
+
+    GizmoImguiEnd();
+    ImGuiWrapper::pop_toolbar_style();
+}
+
+} // namespace GUI
+} // namespace Slic3r
@@ -0,0 +1,48 @@
+#ifndef slic3r_GLGizmoPrimitive_hpp_
+#define slic3r_GLGizmoPrimitive_hpp_
+
+#include "GLGizmoBase.hpp"
+#include "GLGizmosCommon.hpp"
+#include "libslic3r/CAD/GeometryEngine.hpp"
+#include <string>
+#include <wx/event.h>
+#include <cereal/archives/binary.hpp>
+#include "libslic3r/TriangleMesh.hpp"
+
+namespace Slic3r {
+namespace GUI {
+
+class GLGizmoPrimitive : public GLGizmoBase
+{
+public:
+    GLGizmoPrimitive(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id);
+    ~GLGizmoPrimitive() = default;
+
+    bool on_mouse(const wxMouseEvent& mouse_event) override;
+
+protected:
+    bool on_init() override;
+    std::string on_get_name() const override;
+    bool on_is_activable() const override;
+    bool on_is_selectable() const override;
+    void on_render() override;
+    void on_set_state() override;
+    CommonGizmosDataID on_get_requirements() const override;
+    void on_render_input_window(float x, float y, float bottom_limit) override;
+
+    void on_load(cereal::BinaryInputArchive& ar) override;
+    void on_save(cereal::BinaryOutputArchive& ar) const override;
+
+private:
+    void apply_primitive();
+    void apply_preset(const char* name, double w, double h, double d);
+
+    PrimitiveParams m_params;
+    TriangleMesh    m_preview_mesh;
+    bool            m_preview_dirty{true};
+};
+
+} // namespace GUI
+} // namespace Slic3r
+
+#endif // slic3r_GLGizmoPrimitive_hpp_
@@ -0,0 +1,488 @@
+#include "GLGizmoSketch.hpp"
+#include "slic3r/GUI/GLCanvas3D.hpp"
+#include "slic3r/GUI/ImGuiWrapper.hpp"
+#include "slic3r/GUI/Plater.hpp"
+#include "slic3r/GUI/NotificationManager.hpp"
+#include "slic3r/GUI/format.hpp"
+#include "libslic3r/Model.hpp"
+#include <BRepBuilderAPI_MakeFace.hxx>
+#include <BRepPrimAPI_MakeRevol.hxx>
+#include <BRepAlgoAPI_Fuse.hxx>
+#include <string>
+#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
+#include "libslic3r/CAD/SketchEngine.hpp"
+#include "libslic3r/Point.hpp"
+#include <cmath>
+#include <math.h>
+#include <imgui.h>
+#include <cstddef>
+#include <vector>
+#include <stdexcept>
+#include <gp_Pnt.hxx>
+#include <gp_Dir.hxx>
+#include "libslic3r/CAD/GeometryEngine.hpp"
+#include <algorithm>
+#include "slic3r/GUI/GUI_App.hpp"
+#include <utility>
+#include <exception>
+
+#ifndef IMGUI_DEFINE_MATH_OPERATORS
+#define IMGUI_DEFINE_MATH_OPERATORS
+#endif
+#include <imgui/imgui_internal.h>
+#include "libslic3r/TriangleMesh.hpp"
+#include "slic3r/GUI/I18N.hpp"
+#include "slic3r/GUI/Selection.hpp"
+
+namespace Slic3r {
+namespace GUI {
+
+GLGizmoSketch::GLGizmoSketch(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id)
+    : GLGizmoBase(parent, icon_filename, sprite_id) {}
+
+bool GLGizmoSketch::on_init() { return true; }
+std::string GLGizmoSketch::on_get_name() const { return _u8L("Sketch"); }
+// Part of the experimental CAD feature: built into every CAD build, but offered in the Prepare
+// toolbar only when that feature is switched on in Preferences — switched off, Prepare must be
+// exactly what it is without it.
+bool GLGizmoSketch::on_is_activable() const { return wxGetApp().is_enable_cad_feature(); }
+bool GLGizmoSketch::on_is_selectable() const { return wxGetApp().is_enable_cad_feature(); }
+void GLGizmoSketch::on_render() {}
+void GLGizmoSketch::on_set_state() { if (m_state == EState::On) clear_all(); }
+bool GLGizmoSketch::on_mouse(const wxMouseEvent&) { return false; }
+
+CommonGizmosDataID GLGizmoSketch::on_get_requirements() const
+{ return CommonGizmosDataID(int(CommonGizmosDataID::SelectionInfo)); }
+
+void GLGizmoSketch::on_load(cereal::BinaryInputArchive& ar)
+{
+    ar(m_tool, m_profiles, m_plane, m_sp, m_rect_w, m_rect_h, m_circle_r, m_poly_sides, m_poly_r, m_snap_grid, m_grid_step);
+    m_active_profile = -1;
+}
+
+void GLGizmoSketch::on_save(cereal::BinaryOutputArchive& ar) const
+{
+    ar(m_tool, m_profiles, m_plane, m_sp, m_rect_w, m_rect_h, m_circle_r, m_poly_sides, m_poly_r, m_snap_grid, m_grid_step);
+}
+
+SketchProfile& GLGizmoSketch::active_profile()
+{
+    if (m_active_profile < 0 || m_active_profile >= (int)m_profiles.size()) {
+        m_profiles.emplace_back();
+        m_active_profile = (int)m_profiles.size() - 1;
+    }
+    return m_profiles[m_active_profile];
+}
+
+bool GLGizmoSketch::has_closed_profile() const
+{
+    for (auto& p : m_profiles) if (p.closed && p.points.size() >= 3) return true;
+    return false;
+}
+
+void GLGizmoSketch::clear_all()
+{
+    m_profiles.clear();
+    m_canvas_points.clear();
+    m_active_profile = -1;
+}
+
+void GLGizmoSketch::add_closed_profile()
+{
+    auto& ap = active_profile();
+    if (ap.points.size() >= 3) {
+        ap.closed = true;
+        m_active_profile = -1;
+    }
+}
+
+void GLGizmoSketch::delete_profile(int idx)
+{
+    if (idx >= 0 && idx < (int)m_profiles.size()) {
+        m_profiles.erase(m_profiles.begin() + idx);
+        if (m_active_profile >= (int)m_profiles.size()) m_active_profile = -1;
+    }
+}
+
+Vec2d GLGizmoSketch::snap(Vec2d pt) const
+{
+    if (!m_snap_grid) return pt;
+    double gs = m_grid_step;
+    return {round(pt.x() / gs) * gs, round(pt.y() / gs) * gs};
+}
+
+void GLGizmoSketch::build_preset_profile()
+{
+    auto& ap = active_profile();
+    ap.clear();
+    auto add = [&](double x, double y) { ap.points.emplace_back(x, y); };
+    switch (m_tool) {
+    case SketchTool::Rectangle:
+        add(-m_rect_w/2, -m_rect_h/2); add( m_rect_w/2, -m_rect_h/2);
+        add( m_rect_w/2,  m_rect_h/2); add(-m_rect_w/2,  m_rect_h/2);
+        ap.closed = true; m_active_profile = -1; break;
+    case SketchTool::Circle:
+        for (int i = 0; i <= m_circle_seg; ++i) {
+            double a = 2.0*M_PI*i/m_circle_seg;
+            add(cos(a)*m_circle_r, sin(a)*m_circle_r);
+        }
+        ap.closed = true; m_active_profile = -1; break;
+    case SketchTool::Polygon:
+        for (int i = 0; i < m_poly_sides; ++i) {
+            double a = 2.0*M_PI*i/m_poly_sides - M_PI/2;
+            add(cos(a)*m_poly_r, sin(a)*m_poly_r);
+        }
+        ap.closed = true; m_active_profile = -1; break;
+    default: break;
+    }
+}
+
+void GLGizmoSketch::handle_canvas_click(ImVec2 pos)
+{
+    Vec2d pt = snap({pos.x / m_canvas_scale, -pos.y / m_canvas_scale});
+    if (m_tool == SketchTool::Line) {
+        auto& ap = active_profile();
+        if (ap.points.size() >= 3 && (pt - ap.points.front()).norm() < m_grid_step) {
+            ap.points.push_back(ap.points.front());
+            ap.closed = true;
+            m_active_profile = -1;
+            return;
+        }
+        ap.points.push_back(pt);
+    }
+}
+
+void GLGizmoSketch::draw_canvas()
+{
+    ImDrawList* dl = ImGui::GetWindowDrawList();
+    ImVec2 pos = ImGui::GetCursorScreenPos();
+    float w = 280, h = 200;
+    ImVec2 end(pos.x+w, pos.y+h);
+    float cx = pos.x+w/2, cy = pos.y+h/2;
+    auto tc = [&](const ImVec2& p) { return ImVec2(cx+p.x*m_canvas_scale, cy-p.y*m_canvas_scale); };
+
+    dl->AddRectFilled(pos, end, IM_COL32(28,28,36,255));
+    dl->AddRect(pos, end, IM_COL32(55,55,68,255));
+
+    float gs = m_grid_step;
+    for (float g = 0; g < w; g += gs * m_canvas_scale) {
+        ImU32 gc = (int(g/(gs*m_canvas_scale)) % 5 == 0) ? IM_COL32(60,60,75,100) : IM_COL32(45,45,55,60);
+        dl->AddLine({pos.x+g,pos.y}, {pos.x+g,end.y}, gc);
+    }
+    for (float g = 0; g < h; g += gs * m_canvas_scale) {
+        ImU32 gc = (int(g/(gs*m_canvas_scale)) % 5 == 0) ? IM_COL32(60,60,75,100) : IM_COL32(45,45,55,60);
+        dl->AddLine({pos.x,pos.y+g}, {end.x,pos.y+g}, gc);
+    }
+
+    dl->AddLine({cx,pos.y},{cx,end.y}, IM_COL32(70,70,85,180), 1.5f);
+    dl->AddLine({pos.x,cy},{end.x,cy}, IM_COL32(70,70,85,180), 1.5f);
+    dl->AddText({end.x-12, cy+2}, IM_COL32(120,120,140,200), "X");
+    dl->AddText({cx+4, pos.y+2}, IM_COL32(120,120,140,200), "Y");
+
+    for (size_t pi = 0; pi < m_profiles.size(); ++pi) {
+        auto& prof = m_profiles[pi];
+        if (prof.points.size() < 2) continue;
+        std::vector<ImVec2> sp;
+        for (auto& p : prof.points) sp.push_back(tc({(float)p.x(), (float)p.y()}));
+        if (prof.closed && sp.size() >= 3) {
+            bool is_outer = (pi == 0);
+            ImU32 fill = is_outer ? IM_COL32(0,180,90,35) : IM_COL32(180,60,60,35);
+            ImU32 line = is_outer ? IM_COL32(0,220,100,255) : IM_COL32(220,80,80,255);
+            dl->AddConvexPolyFilled(sp.data(), (int)sp.size(), fill);
+            for (size_t i=0; i<sp.size(); ++i)
+                dl->AddLine(sp[i], sp[(i+1)%sp.size()], line, (pi==0)?2.5f:2.0f);
+            for (size_t i=0; i<sp.size()-1; ++i)
+                dl->AddCircleFilled(sp[i], 3.0f, IM_COL32(255,255,255,255));
+        }
+    }
+
+    auto& ap = active_profile();
+    if (!ap.closed && ap.points.size() >= 1) {
+        std::vector<ImVec2> sp;
+        for (auto& p : ap.points) sp.push_back(tc({(float)p.x(), (float)p.y()}));
+        for (size_t i=1; i<sp.size(); ++i)
+            dl->AddLine(sp[i-1], sp[i], IM_COL32(0,200,255,200), 2.0f);
+        for (auto& s : sp) dl->AddCircleFilled(s, 3.5f, IM_COL32(100,200,255,255));
+        ImVec2 mouse = ImGui::GetMousePos();
+        if (mouse.x > pos.x && mouse.x < end.x && mouse.y > pos.y && mouse.y < end.y)
+            dl->AddLine(sp.back(), mouse, IM_COL32(100,160,220,120), 1.5f);
+    }
+
+    ImGui::InvisibleButton("canvas", ImVec2(w,h));
+    if (ImGui::IsItemHovered()) {
+        ImVec2 m = ImGui::GetMousePos();
+        Vec2d sk({(m.x-cx)/m_canvas_scale, -(m.y-cy)/m_canvas_scale});
+        if (m_snap_grid) sk = snap(sk);
+        auto txt = wxString::Format("X:%.1f Y:%.1f", sk.x(), sk.y()).ToStdString();
+        dl->AddText({pos.x+4, end.y-16}, IM_COL32(160,160,180,200), txt.c_str());
+        if (ImGui::IsMouseClicked(ImGuiMouseButton_Left))
+            handle_canvas_click({(m.x-cx)/m_canvas_scale, -(m.y-cy)/m_canvas_scale});
+        if (ImGui::IsMouseClicked(ImGuiMouseButton_Right)) {
+            auto& ap2 = active_profile();
+            if (ap2.points.size() >= 3) {
+                ap2.points.push_back(ap2.points.front());
+                ap2.closed = true;
+                m_active_profile = -1;
+            }
+        }
+    }
+}
+
+TopoDS_Shape GLGizmoSketch::build_combined_shape()
+{
+    if (m_profiles.empty() || !m_profiles[0].closed)
+        throw std::runtime_error(_u8L("No outer profile"));
+
+    TopoDS_Wire outer_wire = m_profiles[0].to_occt_wire(m_plane);
+    BRepBuilderAPI_MakeFace face_maker(outer_wire);
+    if (!face_maker.IsDone()) throw std::runtime_error(_u8L("Failed to make outer face"));
+
+    for (size_t i = 1; i < m_profiles.size(); ++i) {
+        if (!m_profiles[i].closed) continue;
+        TopoDS_Wire inner = m_profiles[i].to_occt_wire(m_plane);
+        face_maker.Add(inner);
+    }
+    face_maker.Build();
+    if (!face_maker.IsDone()) throw std::runtime_error(_u8L("Failed to build face with holes"));
+
+    TopoDS_Face face = face_maker.Face();
+
+    TopoDS_Shape shape;
+    if (m_sp.revolve_deg < 360.0 && m_sp.revolve_deg > 0.0) {
+        gp_Pnt o(m_plane.origin.x(), m_plane.origin.y(), m_plane.origin.z());
+        gp_Dir xd(m_plane.x_axis.x(), m_plane.x_axis.y(), m_plane.x_axis.z());
+        gp_Ax1 axis(o, xd);
+        BRepPrimAPI_MakeRevol rev(face, axis, m_sp.revolve_deg * M_PI / 180.0);
+        if (!rev.IsDone()) throw std::runtime_error(_u8L("Revolve failed"));
+        shape = rev.Shape();
+    } else {
+        shape = SketchEngine::make_extrude_face(face, m_plane, m_sp.extrude_len, m_sp.extrude_sym);
+    }
+
+    if (m_sp.dressup_enabled) {
+        if (m_sp.dressup_type == DressUpType::Fillet)
+            shape = GeometryEngine::apply_fillet(shape, m_sp.dressup_radius, m_sp.dressup_faces);
+        else
+            shape = GeometryEngine::apply_chamfer(shape, m_sp.dressup_chamfer_dist, m_sp.dressup_faces);
+    }
+    return shape;
+}
+
+void GLGizmoSketch::on_render_input_window(float x, float y, float bottom_limit)
+{
+    y = std::min(y, bottom_limit - ImGui::GetWindowHeight());
+    const float scale = m_parent.get_scale();
+    ImGuiWrapper::push_toolbar_style(scale);
+    GizmoImguiSetNextWIndowPos(x, y, ImGuiCond_Always, 0.0f, 0.0f);
+    GizmoImguiBegin("Sketch", ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove
+                               | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse
+                               | ImGuiWindowFlags_NoTitleBar);
+
+    if (ImGui::CollapsingHeader(_u8L("Profile").c_str(), ImGuiTreeNodeFlags_DefaultOpen)) {
+        const std::string names_s[] = {_u8L("Line"), _u8L("Rectangle"), _u8L("Circle"), _u8L("Polygon")};
+        const char* names[] = {names_s[0].c_str(), names_s[1].c_str(), names_s[2].c_str(), names_s[3].c_str()};
+        int cur = (int)m_tool;
+        if (ImGui::Combo("##shape", &cur, names, (int)SketchTool::COUNT)) {
+            m_tool = (SketchTool)cur;
+            if (m_tool != SketchTool::Line) build_preset_profile();
+        }
+        ImGui::SameLine();
+        if (m_imgui->button("+##newprofile")) m_active_profile = -1;
+        if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _u8L("Start new profile (for holes)").c_str());
+
+        if (m_tool == SketchTool::Rectangle) {
+            ImGui::SetNextItemWidth(80); if (ImGui::InputDouble(_u8L("Width").c_str(), &m_rect_w,1,10,"%.0f")) build_preset_profile();
+            ImGui::SameLine();
+            ImGui::SetNextItemWidth(80); if (ImGui::InputDouble(_u8L("Height").c_str(), &m_rect_h,1,10,"%.0f")) build_preset_profile();
+        } else if (m_tool == SketchTool::Circle) {
+            ImGui::SetNextItemWidth(80); if (ImGui::InputDouble(_u8L("Radius").c_str(), &m_circle_r,1,5,"%.0f")) build_preset_profile();
+            ImGui::SameLine();
+            ImGui::SetNextItemWidth(80); if (ImGui::SliderInt(_u8L("Segments").c_str(), &m_circle_seg,8,64)) build_preset_profile();
+        } else if (m_tool == SketchTool::Polygon) {
+            ImGui::SetNextItemWidth(80); if (ImGui::SliderInt(_u8L("Sides").c_str(), &m_poly_sides,3,12)) build_preset_profile();
+            ImGui::SameLine();
+            ImGui::SetNextItemWidth(80); if (ImGui::InputDouble((_u8L("Radius") + "##poly").c_str(), &m_poly_r,1,5,"%.0f")) build_preset_profile();
+        } else {
+            ImGui::Text("%s", _u8L("Click on canvas to draw").c_str());
+        }
+
+        ImGui::Checkbox(_u8L("Snap to grid").c_str(), &m_snap_grid);
+        ImGui::SameLine();
+        ImGui::SetNextItemWidth(80); ImGui::InputFloat(_u8L("Grid step").c_str(), &m_grid_step, 1, 5, "%.0f mm");
+
+        draw_canvas();
+
+        if (!m_profiles.empty()) {
+            ImGui::Text("%s: %zu", _u8L("Profiles").c_str(), m_profiles.size());
+            for (int i = 0; i < (int)m_profiles.size(); ++i) {
+                auto& p = m_profiles[i];
+                ImGui::PushID(i);
+                bool outer = (i == 0);
+                ImVec4 col = outer ? ImVec4(0,1,0,1) : ImVec4(1,0.3f,0.3f,1);
+                const std::string label = outer ? _u8L("Outer") : _u8L("Hole");
+                const std::string state = p.closed ? _u8L("closed") : std::string();
+                // TRN Sketch gizmo profile list: "Outer" or "Hole", profile number, point count, "closed" or nothing
+                ImGui::TextColored(col, "%s", GUI::format(_u8L("%1% %2%: %3% points %4%"), label, i + 1, p.points.size(), state).c_str());
+                ImGui::SameLine();
+                if (ImGui::SmallButton("X")) delete_profile(i);
+                ImGui::PopID();
+            }
+        }
+    }
+
+    ImGui::Separator();
+
+    bool is_revolve = false;
+    bool has_sel = false;
+
+    if (ImGui::CollapsingHeader(_u8L("Operation").c_str(), ImGuiTreeNodeFlags_DefaultOpen)) {
+        static int pi = 0;
+        const std::string plane_names[] = {_u8L("XY (Top)"), _u8L("XZ (Front)"), _u8L("YZ (Side)")};
+        const char* planes[] = {plane_names[0].c_str(), plane_names[1].c_str(), plane_names[2].c_str()};
+        if (ImGui::Combo(_u8L("Plane").c_str(), &pi, planes, 3))
+            m_plane = (pi==0) ? SketchPlane::XY() : (pi==1) ? SketchPlane::XZ() : SketchPlane::YZ();
+
+        is_revolve = (m_sp.revolve_deg > 0 && m_sp.revolve_deg < 360);
+        ImGui::SetNextItemWidth(100);
+        if (ImGui::InputDouble(_u8L("Revolve deg").c_str(), &m_sp.revolve_deg, 15, 90, "%.0f")) {
+            if (m_sp.revolve_deg > 360) m_sp.revolve_deg = 360;
+            if (m_sp.revolve_deg < 0) m_sp.revolve_deg = 0;
+        }
+        if (ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _u8L("Set to 0 for extrude, >0 for revolve").c_str());
+
+        if (!is_revolve) {
+            ImGui::SetNextItemWidth(100);
+            ImGui::InputDouble(_u8L("Length").c_str(), &m_sp.extrude_len, 0.5, 5, "%.1f mm");
+            ImGui::SameLine();
+            ImGui::Checkbox(_u8L("Symmetric").c_str(), &m_sp.extrude_sym);
+        }
+
+        has_sel = !m_parent.get_selection().is_empty();
+        if (has_sel) {
+            if (ImGui::Checkbox(_u8L("Pocket (cut)").c_str(), &m_sp.is_pocket))
+                if (m_sp.is_pocket) m_sp.dressup_enabled = false;
+        } else m_sp.is_pocket = false;
+    }
+
+    ImGui::Separator();
+
+    if (!m_sp.is_pocket && ImGui::CollapsingHeader(_u8L("Fillet / Chamfer").c_str())) {
+        ImGui::Checkbox(_u8L("Enable").c_str(), &m_sp.dressup_enabled);
+        if (m_sp.dressup_enabled) {
+            const std::string dn_s[] = {_u8L("Fillet"), _u8L("Chamfer")};
+            const char* dn[] = {dn_s[0].c_str(), dn_s[1].c_str()};
+            int du = (int)m_sp.dressup_type;
+            ImGui::SetNextItemWidth(100);
+            if (ImGui::Combo("##dtype", &du, dn, 2)) m_sp.dressup_type = (DressUpType)du;
+            const std::string fn_s[] = {_u8L("All edges"), _u8L("Top edges"), _u8L("Bottom edges"), _u8L("Lateral edges")};
+            const char* fn[] = {fn_s[0].c_str(), fn_s[1].c_str(), fn_s[2].c_str(), fn_s[3].c_str()};
+            int fg = (int)m_sp.dressup_faces;
+            ImGui::SetNextItemWidth(140);
+            ImGui::Combo(_u8L("Edges").c_str(), &fg, fn, 4); m_sp.dressup_faces = (FaceGroup)fg;
+            ImGui::SetNextItemWidth(100);
+            if (m_sp.dressup_type == DressUpType::Fillet)
+                ImGui::InputDouble(_u8L("Radius").c_str(), &m_sp.dressup_radius, 0.1, 1, "%.1f mm");
+            else
+                ImGui::InputDouble(_u8L("Distance").c_str(), &m_sp.dressup_chamfer_dist, 0.1, 1, "%.1f mm");
+        }
+    }
+
+    ImGui::Separator();
+
+    bool ok = has_closed_profile();
+    if (ok) ImGui::TextColored({0,1,0,1}, "%s", wxString::Format(_L_PLURAL("%zu closed profile", "%zu closed profiles",
+                                                                             unsigned(m_profiles.size())), m_profiles.size()).ToUTF8().data());
+    else ImGui::TextColored({0.6f,0.6f,0.6f,1}, "%s", _u8L("Draw a closed profile to enable").c_str());
+
+    auto btn = [&](const char* label, bool enabled) {
+        if (!enabled) { ImGui::PushItemFlag(ImGuiItemFlags_Disabled,true); ImGui::PushStyleColor(ImGuiCol_Button,{0.25f,0.25f,0.25f,1}); }
+        bool clicked = ImGui::Button(label, {-1,0});
+        if (!enabled) { ImGui::PopStyleColor(); ImGui::PopItemFlag(); }
+        return clicked && enabled;
+    };
+
+    if (m_sp.is_pocket && has_sel) {
+        if (btn(_u8L("Pocket (cut)").c_str(), ok)) apply_pocket();
+    } else if (is_revolve) {
+        if (btn(_u8L("Revolve").c_str(), ok)) apply_revolve();
+    } else {
+        if (btn(_u8L_CONTEXT("Extrude", "Design").c_str(), ok)) apply_extrude();
+    }
+
+    if (ImGui::Button(_u8L("Clear all").c_str(), {-1,0})) clear_all();
+    if (ImGui::Button(_u8L("Close").c_str(), {-1,0})) m_parent.reset_all_gizmos();
+
+    GizmoImguiEnd();
+    ImGuiWrapper::pop_toolbar_style();
+}
+
+void GLGizmoSketch::apply_extrude()
+{
+    try {
+        TopoDS_Shape shape = build_combined_shape();
+        TriangleMesh mesh = SketchEngine::tessellate(shape, m_sp.linear_deflection);
+        if (mesh.its.indices.empty()) throw std::runtime_error(_u8L("Empty result"));
+        wxGetApp().plater()->take_snapshot("Sketch Extrude");
+        ModelObject* mo = wxGetApp().model().add_object();
+        mo->name = "Extrusion";
+        mo->add_volume(std::move(mesh))->set_new_unique_id();
+        mo->ensure_on_bed();
+        wxGetApp().plater()->update();
+        clear_all();
+    } catch (const std::exception& e) {
+        wxGetApp().notification_manager()->push_notification(NotificationType::CustomNotification, NotificationManager::NotificationLevel::ErrorNotificationLevel, GUI::format(_u8L("Extrude: %1%"), e.what()));
+    }
+}
+
+void GLGizmoSketch::apply_revolve()
+{
+    try {
+        TopoDS_Shape shape = build_combined_shape();
+        TriangleMesh mesh = SketchEngine::tessellate(shape, m_sp.linear_deflection);
+        if (mesh.its.indices.empty()) throw std::runtime_error(_u8L("Empty result"));
+        wxGetApp().plater()->take_snapshot("Sketch Revolve");
+        ModelObject* mo = wxGetApp().model().add_object();
+        mo->name = "Revolve";
+        mo->add_volume(std::move(mesh))->set_new_unique_id();
+        mo->ensure_on_bed();
+        wxGetApp().plater()->update();
+        clear_all();
+    } catch (const std::exception& e) {
+        wxGetApp().notification_manager()->push_notification(NotificationType::CustomNotification, NotificationManager::NotificationLevel::ErrorNotificationLevel, GUI::format(_u8L("Revolve: %1%"), e.what()));
+    }
+}
+
+void GLGizmoSketch::apply_pocket()
+{
+    try {
+        Selection& sel = m_parent.get_selection();
+        int obj_idx = sel.get_object_idx();
+        if (obj_idx < 0) throw std::runtime_error(_u8L("No object selected"));
+        ModelObject* mo = wxGetApp().model().objects[obj_idx];
+
+        TopoDS_Wire outer = m_profiles[0].to_occt_wire(m_plane);
+        BRepBuilderAPI_MakeFace fm(outer);
+        if (!fm.IsDone()) throw std::runtime_error(_u8L("Face failed"));
+        for (size_t i = 1; i < m_profiles.size(); ++i)
+            if (m_profiles[i].closed) fm.Add(m_profiles[i].to_occt_wire(m_plane));
+        fm.Build();
+        if (!fm.IsDone()) throw std::runtime_error(_u8L("Face with holes failed"));
+
+        TopoDS_Shape tool = SketchEngine::make_extrude_face(fm.Face(), m_plane, m_sp.extrude_len + 5.0, false);
+        TriangleMesh tool_mesh = SketchEngine::tessellate(tool, m_sp.linear_deflection);
+        if (tool_mesh.its.indices.empty()) throw std::runtime_error(_u8L("Tool mesh empty"));
+
+        wxGetApp().plater()->take_snapshot("Sketch Pocket");
+        mo->add_volume(std::move(tool_mesh), ModelVolumeType::NEGATIVE_VOLUME)->set_new_unique_id();
+        mo->ensure_on_bed();
+        wxGetApp().plater()->update();
+        clear_all();
+        wxGetApp().notification_manager()->push_notification(NotificationType::CustomNotification, NotificationManager::NotificationLevel::RegularNotificationLevel, _u8L("Pocket added (negative volume)").c_str());
+    } catch (const std::exception& e) {
+        wxGetApp().notification_manager()->push_notification(NotificationType::CustomNotification, NotificationManager::NotificationLevel::ErrorNotificationLevel, GUI::format(_u8L("Pocket: %1%"), e.what()));
+    }
+}
+
+} // namespace GUI
+} // namespace Slic3r
@@ -0,0 +1,81 @@
+#ifndef slic3r_GLGizmoSketch_hpp_
+#define slic3r_GLGizmoSketch_hpp_
+
+#include "GLGizmoBase.hpp"
+#include "GLGizmosCommon.hpp"
+#include "libslic3r/CAD/SketchEngine.hpp"
+#include <cereal/archives/binary.hpp>
+#include <TopoDS_Shape.hxx>
+#include <imgui/imgui.h>
+#include <string>
+#include <wx/event.h>
+#include <vector>
+#include "libslic3r/Point.hpp"
+
+namespace Slic3r {
+namespace GUI {
+
+enum class SketchTool { Line, Rectangle, Circle, Polygon, COUNT };
+
+class GLGizmoSketch : public GLGizmoBase
+{
+public:
+    GLGizmoSketch(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id);
+
+    bool on_mouse(const wxMouseEvent& mouse_event) override;
+
+protected:
+    bool on_init() override;
+    std::string on_get_name() const override;
+    bool on_is_activable() const override;
+    bool on_is_selectable() const override;
+    void on_render() override;
+    void on_set_state() override;
+    CommonGizmosDataID on_get_requirements() const override;
+    void on_render_input_window(float x, float y, float bottom_limit) override;
+
+    void on_load(cereal::BinaryInputArchive& ar) override;
+    void on_save(cereal::BinaryOutputArchive& ar) const override;
+
+private:
+    SketchTool    m_tool{SketchTool::Line};
+    std::vector<SketchProfile> m_profiles;  // multiple profiles (outer + holes)
+    SketchPlane   m_plane{SketchPlane::XY()};
+    SketchParams  m_sp;
+
+    // Shape presets
+    double m_rect_w{20}, m_rect_h{15};
+    double m_circle_r{10}; int m_circle_seg{32};
+    int    m_poly_sides{6}; double m_poly_r{10};
+
+    // Canvas
+    std::vector<ImVec2> m_canvas_points;
+    Vec2d               m_canvas_center{0,0};
+    float               m_canvas_scale{5.0f};
+    bool                m_snap_grid{true};
+    float               m_grid_step{5.0f};
+
+    // Current profile being drawn
+    int m_active_profile{-1};
+
+    SketchProfile& active_profile();
+    bool has_closed_profile() const;
+
+    void build_preset_profile();
+    void add_closed_profile();
+    void delete_profile(int idx);
+    void clear_all();
+
+    TopoDS_Shape build_combined_shape(); // all profiles as face with holes
+    void apply_extrude();
+    void apply_revolve();
+    void apply_pocket();
+    void draw_canvas();
+    void handle_canvas_click(ImVec2 pos);
+    Vec2d snap(Vec2d pt) const;
+};
+
+} // namespace GUI
+} // namespace Slic3r
+
+#endif // slic3r_GLGizmoSketch_hpp_
@@ -1462,11 +1462,8 @@ void GLGizmoTextureDisplacement::render_shaded_preview_mesh()
        // How the entry prints: its filament, or for a mix the two it interleaves and in what ratio.
        shader->set_uniform(("palette_a" + idx).c_str(), e.a);
        shader->set_uniform(("palette_b" + idx).c_str(), e.b);
-        shader->set_uniform(("palette_num" + idx).c_str(), e.num);
-        shader->set_uniform(("palette_den" + idx).c_str(), e.den);
    }
    // The filaments those indices refer to, and the interleave the shader resolves a mix with - the
-    // same inputs make_mix_resolver() gets, so the preview shows the pattern that prints rather than
    // the mix's smooth average colour. m_palette_filaments is what m_shaded_preview_palette was built from.
    const int filament_count =
        (palette_count > 0) ? int(std::min(m_palette_filaments.size(), size_t(PALETTE_MAX_FILAMENTS))) : 0;
@@ -1475,9 +1472,6 @@ void GLGizmoTextureDisplacement::render_shaded_preview_mesh()
        const ColorRGBA &c = m_palette_filaments[size_t(i)];
        shader->set_uniform(("filament_rgb[" + std::to_string(i) + "]").c_str(), Vec3f(c.r(), c.g(), c.b()));
    }
-    shader->set_uniform("mix_mode", int(mv->texture_displacement_options.color_mix_mode));
-    shader->set_uniform("layer_height", color_band_mm(*mv)); // as color_settings_for()
-    shader->set_uniform("dither_cell", std::max(m_subdivide_color_mm, 0.05f) * 2.f); // as color_settings_for()
    if (color_tex != nullptr) {
        shader->set_uniform("color_tex", 1);
        glsafe(::glActiveTexture(GL_TEXTURE1));
@@ -2022,7 +2016,13 @@ void GLGizmoTextureDisplacement::queue_preview_job()
    // The filament list the result's indices refer to, captured with the job rather than read back
    // when it lands - loading a filament meanwhile must not recolour a preview computed against a
    // different list.
-    const std::vector<ColorRGBA> filaments = m_palette_filaments;
+    // Every extruder, not the palette's physical-only list: the bake writes the filament it resolved
+    // to, and a mix resolves to a *mixed filament slot*, which is an extruder past the physical ones.
+    // Grouping against the shorter list dropped every triangle carrying such a slot out of the mesh
+    // entirely - the relief vanished and left only the few triangles that happened to print in a plain
+    // filament. The palette still has to be built from physical filaments alone (see filament_palette()),
+    // which is why these two are not the same list.
+    const std::vector<ColorRGBA> filaments = wxGetApp().plater()->get_extruders_colors();

    m_preview_job_running = true;
    auto &worker = wxGetApp().plater()->get_ui_job_worker();
@@ -4219,19 +4219,44 @@ bool GLGizmoTextureDisplacement::any_layer_colors(const ModelVolume &mv)
    return false;
 }

+void GLGizmoTextureDisplacement::bind_mixes_to_filament_slots(std::vector<PaletteEntry> &palette)
+{
+    Sidebar *sidebar = &wxGetApp().plater()->sidebar();
+    if (sidebar == nullptr)
+        return;
+    for (PaletteEntry &e : palette) {
+        if (!e.is_mix())
+            continue;
+        // Components are 1-based in the config; the ratios are percentages summing to 100, which is the
+        // form create_mixed_filament_from_result() normalises from.
+        const int a_pct = int(std::lround(100.0 * double(e.num) / double(e.den)));
+        const int slot  = sidebar->ensure_mixed_filament({ unsigned(e.a + 1), unsigned(e.b + 1) },
+                                                         { a_pct, 100 - a_pct });
+        if (slot >= 0) {
+            e.a = e.b = slot;
+            e.num = e.den = 1;
+        } else {
+            // No room for another slot. Collapse to the component that dominates the blend, which is what
+            // the old per-triangle path did on a surface it could not band anyway.
+            const int dominant = (e.num * 2 >= e.den) ? e.a : e.b;
+            e.a = e.b = dominant;
+            e.num = e.den = 1;
+        }
+    }
+}
+
 TextureColorSettings GLGizmoTextureDisplacement::color_settings_for(const ModelVolume &mv)
 {
    TextureColorSettings out;
    if (!any_layer_colors(mv))
        return out; // nothing is colouring: every colour path stays switched off
    out.palette          = cached_palette();
-    out.palette_pure     = make_palette(m_palette_filaments, /* mixing */ false);
-    out.mix_mode         = mv.texture_displacement_options.color_mix_mode;
+    out.palette_pure     = make_palette(m_palette_filaments, /* mixing */ false, PALETTE_MAX_ENTRIES);
+    // Done here rather than in cached_palette(): this runs when a preview or a bake is queued, off a
+    // user action, while that one is also touched from the render path - and creating filament slots
+    // there would mutate the project mid-frame.
+    bind_mixes_to_filament_slots(out.palette);
    out.despeckle_passes = mv.texture_displacement_options.color_despeckle;
-    out.layer_height     = color_band_mm(mv);
-    // The dither cell is tied to the colour-detail target: a cell much smaller than a facet cannot be
-    // drawn at all, and one much larger stops reading as a blend and starts reading as a check.
-    out.dither_cell_mm   = std::max(m_subdivide_color_mm, 0.05f) * 2.f;
    return out;
 }

@@ -4244,10 +4269,15 @@ const std::vector<GLGizmoTextureDisplacement::PaletteEntry> &GLGizmoTextureDispl
    const ModelVolume *mv     = texture_volume();
    const bool         mixing = mv != nullptr && mv->texture_displacement_options.color_mix_enabled;
    std::vector<ColorRGBA> filaments = filament_palette();
-    if (m_palette_cache.empty() || filaments != m_palette_filaments || mixing != m_palette_mixing) {
+    // Every mix costs a filament slot once they are bound to one, and the mask can name only so many
+    // states, so the palette has to leave room beside the physical filaments it already counts.
+    const int cap = int(EnforcerBlockerType::ExtruderMax);
+    if (m_palette_cache.empty() || filaments != m_palette_filaments || mixing != m_palette_mixing ||
+        cap != m_palette_cap) {
        m_palette_filaments = std::move(filaments);
        m_palette_mixing    = mixing;
-        m_palette_cache     = make_palette(m_palette_filaments, mixing);
+        m_palette_cap       = cap;
+        m_palette_cache     = make_palette(m_palette_filaments, mixing, cap);
        m_palette_quantizer = make_palette_quantizer(m_palette_cache);
    }
    return m_palette_cache;
@@ -4255,40 +4285,29 @@ const std::vector<GLGizmoTextureDisplacement::PaletteEntry> &GLGizmoTextureDispl

 std::vector<ColorRGBA> GLGizmoTextureDisplacement::filament_palette()
 {
-    std::vector<ColorRGBA> palette = wxGetApp().plater()->get_extruders_colors();
-    // mmu_segmentation_facets encodes the filament in a 6-bit prefix code and stops at Extruder16.
+    std::vector<ColorRGBA> all = wxGetApp().plater()->get_extruders_colors();
+
+    // Physical filaments only. The mixes this palette produces each become a mixed filament slot of
+    // their own (see bind_mixes_to_filament_slots()), and those slots are extruders too - so taking the
+    // list as it comes meant the next rebuild mixed *them* again, and handed components naming a
+    // virtual slot to a blend that can only name physical ones. That is what left entries reading
+    // "filament 1 plus nothing" and raised "Mixed filament has invalid or mismatched components".
+    const auto *is_mixed = wxGetApp().preset_bundle->project_config.option<ConfigOptionBools>("filament_is_mixed");
+    std::vector<ColorRGBA> palette;
+    palette.reserve(all.size());
+    for (size_t i = 0; i < all.size(); ++i)
+        if (is_mixed == nullptr || i >= is_mixed->values.size() || !is_mixed->values[i])
+            palette.push_back(all[i]);
+
+    // A paint mask can only name so many states, and every mix spends one beside these.
    if (palette.size() > size_t(EnforcerBlockerType::ExtruderMax))
        palette.resize(size_t(EnforcerBlockerType::ExtruderMax));
    return palette;
 }

-float GLGizmoTextureDisplacement::color_band_mm(const ModelVolume &mv)
-{
-    const float lh   = print_layer_height();
-    const float edge = (mv.texture_displacement_options.v2_refine_mm > 0.f) ? mv.texture_displacement_options.v2_refine_mm
-                                                                           : v2_recommendation(mv).edge_mm;
-    if (edge <= 0.f || lh <= 0.f)
-        return lh;
-    // A refined triangle of edge e stacks in rows about 0.87 * e apart (an equilateral triangle's
-    // height), and a dither needs at least two rows per period to be a dither at all.
-    constexpr float ROW_PER_EDGE = 0.87f;
-    return lh * std::max(1.f, std::ceil(2.f * ROW_PER_EDGE * edge / lh));
-}
-
-float GLGizmoTextureDisplacement::print_layer_height()
-{
-    try {
-        const DynamicPrintConfig &cfg = wxGetApp().preset_bundle->prints.get_edited_preset().config;
-        if (const ConfigOptionFloat *opt = cfg.option<ConfigOptionFloat>("layer_height"); opt != nullptr)
-            if (opt->value > 1e-3)
-                return float(opt->value);
-    } catch (...) {
-    }
-    return 0.2f;
-}

 std::vector<GLGizmoTextureDisplacement::PaletteEntry> GLGizmoTextureDisplacement::make_palette(
-    const std::vector<ColorRGBA> &filaments, bool mixing)
+    const std::vector<ColorRGBA> &filaments, bool mixing, int max_entries)
 {
    std::vector<PaletteEntry> out;
    const int                 n = int(filaments.size());
@@ -4305,7 +4324,7 @@ std::vector<GLGizmoTextureDisplacement::PaletteEntry> GLGizmoTextureDisplacement
    const int pairs = n * (n - 1) / 2;
    int       steps = 0;
    for (int s = 5; s >= 1; --s)
-        if (n + pairs * s <= PALETTE_MAX_ENTRIES) {
+        if (n + pairs * s <= max_entries) {
            steps = s;
            break;
        }
@@ -4327,51 +4346,6 @@ std::vector<GLGizmoTextureDisplacement::PaletteEntry> GLGizmoTextureDisplacement
    return out;
 }

-ColorResolveFn GLGizmoTextureDisplacement::make_mix_resolver(const std::vector<PaletteEntry> &palette,
-                                                             ColorMixMode mode, float layer_height,
-                                                             float cell_mm)
-{
-    if (palette.empty())
-        return nullptr;
-    auto        entries = std::make_shared<std::vector<PaletteEntry>>(palette);
-    const float band    = std::max(layer_height, 0.01f);
-    const float cell    = std::max(cell_mm, 0.01f);
-
-    return [entries, mode, band, cell](int index, const Vec3f &pos, const Vec3f &normal) -> int {
-        if (index < 0 || size_t(index) >= entries->size())
-            return -1;
-        const PaletteEntry &e = (*entries)[size_t(index)];
-        if (!e.is_mix())
-            return e.a;
-
-        // Which of the two filaments this point falls on. Both patterns are *ordered*, never random:
-        // the eye blends a regular pattern into a flat colour, and turns a random one into noise.
-        // Auto: bands wherever the surface is steeper than ~45 degrees - consecutive layers alternate
-        // there, which is how a blend prints and reads. On a flat-facing surface a layer is one band
-        // and the only way to interleave is a checkerboard across the surface, which at print scale
-        // reads as a pattern rather than a colour; there the mix falls back to its dominant filament.
-        const bool upright = std::abs(normal.z()) < 0.7f;
-        if (mode == ColorMixMode::Auto && !upright)
-            return e.num * 2 >= e.den ? e.a : e.b;
-        const bool bands = mode == ColorMixMode::ZBands || mode == ColorMixMode::Auto;
-        if (bands) {
-            // One band per print layer. floorf, not a cast, so this stays correct below z = 0.
-            const int slot = int(std::floor(pos.z() / band));
-            const int phase = ((slot % e.den) + e.den) % e.den;
-            return phase < e.num ? e.a : e.b;
-        }
-        // Ordered 4x4 Bayer over the surface, indexed by position so the pattern is stable in space
-        // rather than in triangle order (which would move under any remesh, and read as noise).
-        static const int BAYER[16] = { 0, 8, 2, 10, 12, 4, 14, 6, 3, 11, 1, 9, 15, 7, 13, 5 };
-        const int gx = ((int(std::floor(pos.x() / cell)) % 4) + 4) % 4;
-        const int gy = ((int(std::floor(pos.y() / cell)) % 4) + 4) % 4;
-        // A third axis would be ideal, but the two dominant ones are enough for a surface pattern and
-        // keep the cell square on the faces that matter.
-        const float threshold = (float(BAYER[gy * 4 + gx]) + 0.5f) / 16.f;
-        return (float(e.num) / float(e.den)) > threshold ? e.a : e.b;
-    };
-}
-
 ColorQuantizeFn GLGizmoTextureDisplacement::make_palette_quantizer(const std::vector<PaletteEntry> &palette)
 {
    if (palette.empty())
@@ -4408,10 +4382,15 @@ ColorQuantizeFn GLGizmoTextureDisplacement::make_palette_quantizer(const std::ve
                            best_pure   = int(i);
                        }
                    }
-                    // A mix is an interleave that only reads as its colour from a distance; up close
-                    // it is stripes. Spend it only where it buys a clearly better match than the nearest
-                    // single filament: ten Delta E is a visible step, less is not worth the stripes.
-                    constexpr float PREFER_PURE_DE = 10.f;
+                    // A mix is an interleave that only reads as its colour from a distance; up close it is
+                    // stripes. So it is spent only where it buys a better match than the nearest single
+                    // filament - but "better" was set at ten Delta E, which is not a visible step, it is a
+                    // different colour. Measured over the whole cube that threshold turned 94% of the
+                    // lookups that wanted a mix back into a pure filament, leaving 38%; along a greyscale
+                    // ramp, the shape a height texture actually traces, it cut 80% to 66%. Two Delta E is
+                    // about where a side-by-side difference stops being arguable, which is the right place
+                    // to start paying for stripes.
+                    constexpr float PREFER_PURE_DE = 2.f;
                    if (best_pure >= 0 && palette[size_t(best)].is_mix() && best_pure_d - best_d < PREFER_PURE_DE)
                        best = best_pure;
                    (*lut)[(size_t(r) * E + size_t(g)) * E + size_t(b)] = uint8_t(best);
@@ -4511,7 +4490,7 @@ TextureDisplacementPrepareResult GLGizmoTextureDisplacement::prepare_mesh(
            if (params.subdiv_color_edge_mm > 0.f && !palette.empty())
                color = make_combined_color_sampler(mesh.its, layers, current, make_palette_quantizer(palette));
            // Note the sampler is built on the *quantizer* alone - the refinement follows perceived
-            // colour, never the interleaving that realises a mix (see ColorResolveFn).
+            // colour, never the interleaving that realises a mix - the slicer does that per layer.
            // "Min edge" is a feature-mode control (it is the floor the curvature test refines down
            // to); in plain adaptive mode the target edge length is the only criterion, so the floor
            // must not be allowed to silently override a target the user set below it.
@@ -6069,24 +6048,6 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                                       "of filaments can cover a photo or a gradient. An image of flat colors "
                                       "prints the same either way. Off uses one filament per area."));
                        if (opts.color_mix_enabled) {
-                            slider_label(_L("Mix by"));
-                            const std::string mix_z       = _u8L("Layers");
-                            const std::string mix_xy      = _u8L_CONTEXT("Surface", "Texture Displacement");
-                            const std::string mix_auto    = _u8L("Automatic");
-                            const char       *mix_items[] = { mix_z.c_str(), mix_xy.c_str(), mix_auto.c_str() };
-                            int               mix_mode    = int(opts.color_mix_mode);
-                            ImGui::SetNextItemWidth(-card_pad);
-                            if (scoped_combo("##color_mix_mode", &mix_mode, mix_items, IM_ARRAYSIZE(mix_items))) {
-                                opts.color_mix_mode    = ColorMixMode(mix_mode);
-                                m_preview_params_dirty = true;
-                            }
-                            hover_tip(_u8L("Layers: the two filaments alternate between print layers, which "
-                                           "blends smoothly on upright surfaces but disappears on flat-facing "
-                                           "ones, where a whole layer is a single band.\n"
-                                           "Surface: a fine checkerboard across the surface, which works at "
-                                           "any angle but can read as texture rather than as a blend.\n"
-                                           "Automatic: layers on upright faces; flat-facing faces take the nearer "
-                                           "single filament, since a checkerboard there shows as a pattern."));
                            ImGui::TextDisabled("%s", Slic3r::format(_u8L("%1% printable colors from %2% filaments"),
                                                                     int(cached_palette().size()), int(m_palette_filaments.size())).c_str());
                        }
@@ -81,7 +81,11 @@ public:
    // How many ratios depends on how many filaments there are, so the palette stays bounded: the
    // quantizer's lookup cube costs one DeltaE00 per cell per entry to fill, and with sixteen
    // filaments there are already plenty of colours without mixing any of them.
-    static std::vector<PaletteEntry> make_palette(const std::vector<ColorRGBA> &filaments, bool mixing);
+    // `max_entries` bounds the whole palette. It is normally the quantizer's own limit, but when the
+    // mixes become filament slots it has to be the paint mask's instead: a mask can name only
+    // EnforcerBlockerType::ExtruderMax states, and every mix now occupies one of them.
+    static std::vector<PaletteEntry> make_palette(const std::vector<ColorRGBA> &filaments, bool mixing,
+                                                  int max_entries);

    // Maps an image colour to the closest entry of `palette`, perceptually (CIEDE2000 over CIELAB - a
    // plain RGB distance picks visibly wrong filaments, most obviously between a saturated colour and
@@ -95,9 +99,6 @@ public:

    // Turns a palette index plus a position into the filament to print there, interleaving the two
    // filaments of a mixed entry per `mode`. `layer_height` sizes the Z bands; `cell_mm` the dither
-    // cells. See ColorResolveFn for why this is separate from the quantizer.
-    static ColorResolveFn make_mix_resolver(const std::vector<PaletteEntry> &palette, ColorMixMode mode,
-                                            float layer_height, float cell_mm);

    // Everything the jobs need to colour with, for the current volume: palette, mix mode, layer
    // height, despeckle. Empty when no layer is actually colouring.
@@ -106,16 +107,20 @@ public:
    // The printable palette for the current filaments and mixing setting, rebuilt only when either
    // actually changes - see the definition for why that caching is not optional.
    const std::vector<PaletteEntry> &cached_palette();
+    // Turns every mix in `palette` into a mixed filament slot and rewrites the entry to name that slot
+    // as a plain filament, so nothing downstream has to know a mix is involved: is_mix() goes false and
+    // the resolver simply returns it. The per-layer interleaving then happens in the slicer, where it is
+    // not limited by how fine the mesh is. Entries whose slot could not be created (the paint-state cap)
+    // fall back to the nearer of the two components.
+    void bind_mixes_to_filament_slots(std::vector<PaletteEntry> &palette);
    std::vector<PaletteEntry>  m_palette_cache;
    std::vector<ColorRGBA>     m_palette_filaments;
+    int                        m_palette_cap = 0; // the max_entries m_palette_cache was built with
    bool                       m_palette_mixing = false;
    ColorQuantizeFn            m_palette_quantizer;

    // The loaded filaments, clamped to the sixteen mmu_segmentation_facets can address.
    static std::vector<ColorRGBA> filament_palette();
-    // The print's layer height, which sizes ColorMixMode::ZBands. Falls back to 0.2 mm if it cannot be
-    // read - a wrong band size is a cosmetic error, not a reason to refuse to colour anything.
-    static float print_layer_height();
    // The Z band height, in mm. One print layer is the ideal, but the interleave is realised per
    // *facet*: a band thinner than the mesh can resolve does not dither, it beats against the triangle
    // grid and comes out as broad horizontal stripes - and since MMU segmentation reads facet colour,
@@ -123,7 +128,6 @@ public:
    // diagonal and knows nothing about the layer height, so the band is rounded up to a whole number of
    // layers at least two facet rows tall: still exact on the printer, and representable by the mesh
    // that has to carry it. Used by both the bake settings and the preview shader, so the two agree.
-    float        color_band_mm(const ModelVolume &mv);

    // The Normal preview's triangles, grouped by the filament they will print in. Colour is per facet
    // and there are at most sixteen filaments, so the mesh is uploaded once with its index buffer
@@ -50,6 +50,10 @@
 #include <wx/event.h>
 #include <optional>
 #include "libslic3r/AppConfig.hpp"
+#ifdef SLIC3R_CAD
+#include "slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp"
+#include "slic3r/GUI/Gizmos/GLGizmoSketch.hpp"
+#endif

 #include "libslic3r/Model.hpp"

@@ -213,6 +217,14 @@ void GLGizmosManager::switch_gizmos_icon_filename()
        case (EType::BrimEars):
            gizmo->set_icon_filename(m_is_dark ? "toolbar_brimears_dark.svg" : "toolbar_brimears.svg");
            break;
+#ifdef SLIC3R_CAD
+        case (EType::Primitive):
+            gizmo->set_icon_filename(m_is_dark ? "toolbar_modifier_cube_dark.svg" : "toolbar_modifier_cube.svg");
+            break;
+        case (EType::Sketch):
+            gizmo->set_icon_filename(m_is_dark ? "toolbar_sketch_dark.svg" : "toolbar_sketch.svg");
+            break;
+#endif
        }

    }
@@ -258,6 +270,14 @@ bool GLGizmosManager::init()
    m_gizmos.emplace_back(new GLGizmoAssembly(m_parent, m_is_dark ? "toolbar_assembly_dark.svg" : "toolbar_assembly.svg", EType::Assembly));
    m_gizmos.emplace_back(new GLGizmoSimplify(m_parent, "reduce_triangles.svg", EType::Simplify));
    m_gizmos.emplace_back(new GLGizmoBrimEars(m_parent, m_is_dark ? "toolbar_brimears_dark.svg" : "toolbar_brimears.svg", EType::BrimEars));
+#ifdef SLIC3R_CAD
+    // Registered last: Primitive and Sketch are the final entries before Undefined, so
+    // omitting them leaves every preceding m_gizmos index (indexed by EType) untouched.
+    if (wxGetApp().is_enable_cad_feature()) {
+        m_gizmos.emplace_back(new GLGizmoPrimitive(m_parent, m_is_dark ? "toolbar_modifier_cube_dark.svg" : "toolbar_modifier_cube.svg", static_cast<unsigned int>(Primitive)));
+        m_gizmos.emplace_back(new GLGizmoSketch(m_parent, m_is_dark ? "toolbar_sketch_dark.svg" : "toolbar_sketch.svg", static_cast<unsigned int>(Sketch)));
+    }
+#endif
    //m_gizmos.emplace_back(new GLGizmoSlaSupports(m_parent, "sla_supports.svg", sprite_id++));
    //m_gizmos.emplace_back(new GLGizmoFaceDetector(m_parent, "face recognition.svg", sprite_id++));
    //m_gizmos.emplace_back(new GLGizmoHollow(m_parent, "hollow.svg", sprite_id++));
@@ -1355,7 +1375,8 @@ GLGizmoBase* GLGizmosManager::get_current() const

 GLGizmoBase* GLGizmosManager::get_gizmo(GLGizmosManager::EType type) const
 {
-    return ((type == Undefined) || m_gizmos.empty()) ? nullptr : m_gizmos[type].get();
+    // m_gizmos ends before the enum does when the CAD gizmos are not registered.
+    return type < m_gizmos.size() ? m_gizmos[type].get() : nullptr;
 }

 GLGizmosManager::EType GLGizmosManager::get_gizmo_from_name(const std::string& gizmo_name) const
@@ -102,6 +102,12 @@ public:
        Assembly,
        Simplify,
        BrimEars,
+#ifdef SLIC3R_CAD
+        // Both need the CAD kernel (GeometryEngine); keep them last so that with
+        // SLIC3R_CAD off the enum matches upstream's numbering exactly.
+        Primitive,
+        Sketch,
+#endif
        //SlaSupports,
        // BBS
        //FaceRecognition,
@@ -53,9 +53,6 @@ void TextureDisplacementBakeJob::process(Ctl &ctl)
        color_request.quantize = GLGizmoTextureDisplacement::make_palette_quantizer(m_input.color.palette);
        if (!m_input.color.palette_pure.empty())
            color_request.quantize_pure = GLGizmoTextureDisplacement::make_palette_quantizer(m_input.color.palette_pure);
-        color_request.resolve  = GLGizmoTextureDisplacement::make_mix_resolver(
-            m_input.color.palette, m_input.color.mix_mode, m_input.color.layer_height,
-            m_input.color.dither_cell_mm);
        color_request.despeckle_passes = m_input.color.despeckle_passes;
        color_request.out_triangle     = &m_triangle_color;
        if (color_request.quantize)
@@ -32,9 +32,6 @@ void TextureDisplacementPreviewJob::process(Ctl &ctl)
        color_request.quantize = GLGizmoTextureDisplacement::make_palette_quantizer(m_input.color.palette);
        if (!m_input.color.palette_pure.empty())
            color_request.quantize_pure = GLGizmoTextureDisplacement::make_palette_quantizer(m_input.color.palette_pure);
-        color_request.resolve  = GLGizmoTextureDisplacement::make_mix_resolver(
-            m_input.color.palette, m_input.color.mix_mode, m_input.color.layer_height,
-            m_input.color.dither_cell_mm);
        color_request.despeckle_passes = m_input.color.despeckle_passes;
        color_request.out_triangle     = &m_result.triangle_color;
        if (color_request.quantize)
@@ -935,6 +935,7 @@ struct Sidebar::priv
    StaticLine*       m_text_mixed_title{nullptr};
    ScalableButton*   m_btn_mixed_add{nullptr};
    ScalableButton*   m_btn_mixed_del{nullptr};
+    ScalableButton*   m_btn_mixed_del_all{nullptr};
    wxScrolledWindow* m_mixed_scroll_area{nullptr};       // independent scrollbar for mixed rows
    wxPanel*          m_panel_mixed_content{nullptr};
    wxBoxSizer*       m_sizer_mixed_filaments{nullptr};   // two-column, mirrors sizer_filaments
@@ -3449,6 +3450,11 @@ Sidebar::Sidebar(Plater *parent)
        });
        title_sizer->Add(p->m_btn_mixed_del, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(SidebarProps::IconSpacing()));

+        p->m_btn_mixed_del_all = new ScalableButton(p->m_panel_mixed_title, wxID_ANY, "delete_all_filaments");
+        p->m_btn_mixed_del_all->SetToolTip(_L("Remove all mixed filaments"));
+        p->m_btn_mixed_del_all->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { remove_all_mixed_filaments(); });
+        title_sizer->Add(p->m_btn_mixed_del_all, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(SidebarProps::IconSpacing()));
+
        p->m_btn_mixed_add = new ScalableButton(p->m_panel_mixed_title, wxID_ANY, "add_filament");
        p->m_btn_mixed_add->SetToolTip(_L("Add mixed filament"));
        p->m_btn_mixed_add->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) { add_mixed_filament(); });
@@ -5122,6 +5128,58 @@ static bool create_mixed_filament_from_result(
    return true;
 }

+int Sidebar::ensure_mixed_filament(const std::vector<unsigned int> &components, const std::vector<int> &ratios)
+{
+    if (components.size() < 2 || components.size() != ratios.size())
+        return -1;
+    if (p->combos_filament.size() < 2)
+        return -1;
+
+    // Normalise the way create_mixed_filament_from_result() stores them, so the comparison below sees
+    // the same text the config holds rather than two spellings of one blend.
+    int ratio_sum = 0;
+    for (const int r : ratios)
+        ratio_sum += r;
+    if (ratio_sum <= 0)
+        return -1;
+
+    std::string comp_str, ratio_str;
+    {
+        CNumericLocalesSetter c_locale_setter;
+        for (size_t i = 0; i < components.size(); ++i) {
+            if (i > 0) { comp_str += ","; ratio_str += ","; }
+            comp_str += std::to_string(components[i]);
+            char buf[32];
+            std::snprintf(buf, sizeof(buf), "%.4f", float(ratios[i]) / float(ratio_sum));
+            ratio_str += buf;
+        }
+    }
+
+    const auto &project_config = wxGetApp().preset_bundle->project_config;
+    const auto *is_mixed_opt   = project_config.option<ConfigOptionBools>("filament_is_mixed");
+    const auto *comp_opt       = project_config.option<ConfigOptionStrings>("filament_mixed_components");
+    const auto *ratios_opt     = project_config.option<ConfigOptionStrings>("filament_mixed_sublayer_ratios");
+    if (is_mixed_opt != nullptr && comp_opt != nullptr && ratios_opt != nullptr)
+        for (size_t i = 0; i < is_mixed_opt->values.size(); ++i)
+            if (is_mixed_opt->values[i] && i < comp_opt->values.size() && i < ratios_opt->values.size() &&
+                comp_opt->values[i] == comp_str && ratios_opt->values[i] == ratio_str)
+                return int(i);
+
+    if (wxGetApp().preset_bundle->filament_presets.size() >= size_t(EnforcerBlockerType::ExtruderMax))
+        return -1;
+
+    std::vector<std::string> color_strs, names, types;
+    collect_physical_filament_info(color_strs, names, types);
+
+    MixedFilamentResult result;
+    result.components = components;
+    result.ratios     = ratios;
+    const size_t created_at = wxGetApp().preset_bundle->filament_presets.size();
+    if (!create_mixed_filament_from_result(this, result, color_strs))
+        return -1;
+    return int(created_at);
+}
+
 void Sidebar::add_mixed_filament()
 {
    auto* plater = dynamic_cast<Plater*>(GetParent());
@@ -5299,6 +5357,28 @@ void Sidebar::edit_mixed_filament(size_t panel_idx)
    }
 }

+void Sidebar::remove_all_mixed_filaments()
+{
+    auto *plater = dynamic_cast<Plater *>(GetParent());
+    if (plater == nullptr)
+        return;
+    const size_t count = plater->mixed_filament_config_indices().size();
+    if (count == 0)
+        return;
+
+    // Worth a confirmation: this drops filament slots the model may be painted with, and anything
+    // painted in one falls back to a plain filament.
+    MessageDialog dlg(this, format_wxstr(_L("Remove all %1% mixed filaments?"), count), _L("Mixed Filament"),
+                      wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION);
+    if (dlg.ShowModal() != wxID_YES)
+        return;
+
+    // Back to front: delete_mixed_filament_at() indexes the list as it stands, so removing from the end
+    // leaves the indices of everything still to go untouched.
+    for (size_t i = count; i-- > 0;)
+        delete_mixed_filament_at(i);
+}
+
 void Sidebar::delete_mixed_filament_at(size_t panel_idx)
 {
    auto* plater = dynamic_cast<Plater*>(GetParent());
@@ -292,8 +292,19 @@ public:

    // Mixed-color filament sidebar section
    void add_mixed_filament();
+    // The filament slot that blends `components` (1-based physical filament indices) in `ratios`
+    // (percentages), creating it when no existing mixed slot already describes that blend. Returns the
+    // 0-based filament index, or -1 when the paint-state cap leaves no room for another one.
+    //
+    // Exists so a feature that needs a blend can ask for one without going through the modal dialog:
+    // the texture displacement gizmo turns each mix in its palette into a slot, which is what moves the
+    // interleaving from its own paint mask to the slicer, where it happens per layer.
+    int ensure_mixed_filament(const std::vector<unsigned int> &components, const std::vector<int> &ratios);
    void edit_mixed_filament(size_t idx);
    void delete_mixed_filament_at(size_t idx);
+    // Drops every mixed filament at once, after confirming. The texture displacement gizmo can create
+    // one slot per colour in its palette, so clearing them one at a time is tedious.
+    void remove_all_mixed_filaments();
    void decompose_filament_color(int filament_idx);
    void recalc_filament_scroll_sizes();
    void update_mixed_filament_list();
@@ -14,7 +14,6 @@
 #include "Widgets/DialogButtons.hpp"
 #include "Widgets/StaticLine.hpp"
 #include "Widgets/StateColor.hpp"
-#include "Widgets/SwitchButton.hpp"

 #include "libslic3r/PrintConfig.hpp"
 #include "libslic3r/Preset.hpp"
@@ -865,25 +864,34 @@ void PublishSettingsDialog::build_option_model()
    };

    // --- Phase 1: printer per-extruder retraction settings (first, mirroring the sidebar's
-    // Printer group), from the printer tab's "Extruder" page. One inner tab per extruder (named
-    // as on the printer tab's switch, e.g. "Left Extruder"/"Right Extruder" via
-    // Tab::translate_category), each holding that extruder's Retraction and Z-Hop rows with
-    // per-extruder "#N" values.
+    // Printer group), from the printer tab's "Extruder"/"Extruder N" pages. One inner tab per
+    // extruder (e.g. "Left Extruder"/"Right Extruder" via Tab::translate_category), each holding
+    // that extruder's Retraction and Z-Hop rows with per-extruder "#N" values.
    {
        size_t g = section_group_for(Section::Printer);
        std::set<std::string> printer_added;
        for (Tab* tab : wxGetApp().tabs_list) {
-            // The page's controls edit the extruder chosen on the printer tab's switch, so its
-            // option list is read once per extruder.
-            auto*       printer_tab = dynamic_cast<TabPrinter*>(tab);
-            const Page* page        = printer_tab ? printer_tab->extruder_page() : nullptr;
-            if (page == nullptr)
+            if (tab->m_type != Preset::TYPE_PRINTER)
                continue;
-            const size_t extruders_count = printer_tab->m_extruders_count;
-            for (size_t extruder_idx = 0; extruder_idx < extruders_count; ++extruder_idx) {
-                const wxString page_title = Tab::translate_category(extruders_count > 1 ? wxString::Format("Extruder %d", int(extruder_idx + 1)) : wxString("Extruder"), tab->m_type);
-                // Retraction and Z-Hop values are stored per variant column, not per extruder.
-                const int variant_index = printer_tab->extruder_variant_index(int(extruder_idx));
+            for (const PageShp& page : tab->m_pages) {
+                if (!page->title().StartsWith("Extruder"))
+                    continue;
+                // The extruder index of this page: its options are appended with the same
+                // "#N" opt_index (opt.second.second), so derive the tab's index from the first
+                // allowlisted option; skip the page when none is found (defensive).
+                int extruder_idx = -1;
+                for (const ConfigOptionsGroupShp& optgroup : page->m_optgroups) {
+                    if (optgroup->title != "Retraction" && optgroup->title != "Z-Hop")
+                        continue;
+                    for (const auto& opt : optgroup->opt_map())
+                        if (extruder_idx < 0)
+                            extruder_idx = opt.second.second;
+                    if (extruder_idx >= 0)
+                        break;
+                }
+                if (extruder_idx < 0)
+                    continue;
+                const wxString page_title = Tab::translate_category(page->title(), tab->m_type);
                for (const ConfigOptionsGroupShp& optgroup : page->m_optgroups) {
                    // Allowlist on the untranslated optgroup title; the "Retraction when
                    // switching material" group is intentionally skipped.
@@ -891,17 +899,17 @@ void PublishSettingsDialog::build_option_model()
                        continue;
                    const wxString subcategory = _(optgroup->title);
                    for (const auto& opt : optgroup->opt_map()) {
+                        const std::string& opt_id   = opt.first;
                        const std::string& pure_key = opt.second.first;
                        // Rows are keyed by the full per-extruder "#N" opt_id so each extruder
                        // tab publishes its own value; GetPublishedKeys() emits the checked rows
                        // as-is.
-                        const std::string opt_id = pure_key + "#" + std::to_string(variant_index);
                        if (!printer_added.insert(opt_id).second)
                            continue;
                        wxString label, value, unit;
                        if (!option_text(opt_id, pure_key, label, value, unit))
                            continue;
-                        size_t cat_index = category_index_for(page_title, Section::Printer, g, extruder_idx);
+                        size_t cat_index = category_index_for(page_title, Section::Printer, g, size_t(extruder_idx));
                        size_t sub_index = subcategory_index_for(cat_index, subcategory, optgroup->icon);
                        add_row_ui(opt_id, label, value, unit, cat_index, sub_index);
                    }
@@ -1090,10 +1098,6 @@ void PublishSettingsDialog::build_option_model()
    for (SectionGroup& section : m_sections)
        if (!section.categories.empty())
            section.tabs->SelectItem(0);
-    // Orca: the Printer section shows its extruders on the same switch as the printer tab's Extruder page.
-    for (size_t s = 0; s < m_sections.size(); ++s)
-        if (m_sections[s].kind == Section::Printer && m_sections[s].categories.size() > 1)
-            setup_variant_switch(s);
    if (!m_sections.empty()) {
        m_outer_tabs->SelectItem(0);
        show_outer_page(0);
@@ -1626,8 +1630,6 @@ void PublishSettingsDialog::show_inner_page(size_t section_index, int inner_inde
        section.selected_mixed = -1;
    }
    section.selected_inner = inner_index;
-    if (section.variant_switch != nullptr)
-        section.variant_switch->SetSelection(inner_index); // fires its event, which ignores the shown page
    Category& category     = m_categories[section.categories[inner_index]];
    category.page->Show();
    category.scroll->FitInside();
@@ -1637,32 +1639,6 @@ void PublishSettingsDialog::show_inner_page(size_t section_index, int inner_inde
    section.page_host_sizer->Layout();
 }

-void PublishSettingsDialog::setup_variant_switch(size_t section_index)
-{
-    SectionGroup& section = m_sections[section_index];
-    std::vector<wxString> titles;
-    for (size_t category : section.categories)
-        titles.push_back(m_categories[category].title);
-
-    section.variant_switch = new MultiSwitchButton(section.page);
-    section.variant_switch->SetFitToOptions();
-    section.variant_switch->SetOptions(titles);
-    section.variant_switch->SetSelection(section.selected_inner);
-    section.variant_switch->Bind(wxCUSTOMEVT_MULTISWITCH_SELECTION, [this, section_index](wxCommandEvent& evt) {
-        evt.Skip();
-        // The hidden tab strip stays the selection model; its event shows the page.
-        SectionGroup& sec = m_sections[section_index];
-        if (evt.GetInt() != sec.selected_inner)
-            sec.tabs->SelectItem(evt.GetInt());
-    });
-
-    // The switch takes the place of the tab strip, centered like on the printer tab.
-    wxSizer* page_sizer = section.page->GetSizer();
-    page_sizer->Insert(1, section.variant_switch, 0, wxALIGN_CENTER_HORIZONTAL | wxTOP, FromDIP(4));
-    section.tabs->Hide();
-    section.page->Layout();
-}
-
 void PublishSettingsDialog::show_mixed_page(size_t section_index, int mixed_index)
 {
    if (section_index >= m_sections.size())
@@ -2208,13 +2184,6 @@ void PublishSettingsDialog::refresh_tab_indicators()
        for (size_t i = 0; i < section.categories.size(); ++i) {
            const bool on = category_has_selection(m_categories[section.categories[i]]);
            section.tabs->SetItemIndicator(static_cast<unsigned int>(i), on);
-            // The switch has no indicator dot; mark its option text instead.
-            if (section.variant_switch != nullptr) {
-                const wxString& title = m_categories[section.categories[i]].title;
-                const wxString  text  = on ? title + wxString(" ") + wxString(wxUniChar(0x2022)) : title;
-                if (section.variant_switch->GetOptionText(static_cast<unsigned int>(i)) != text)
-                    section.variant_switch->SetOptionText(static_cast<unsigned int>(i), text);
-            }
            any = any || on;
        }
        if (section.mixed_tabs != nullptr)
@@ -2279,8 +2248,6 @@ void PublishSettingsDialog::on_dpi_changed(const wxRect& suggested_rect)
        section.tabs->Rescale();
        if (section.mixed_tabs != nullptr)
            section.mixed_tabs->Rescale();
-        if (section.variant_switch != nullptr)
-            section.variant_switch->Rescale();
    }

    // Refresh the per-row Color chips at the new DPI (they carry the slot number too).
@@ -37,7 +37,6 @@ namespace Slic3r { class DynamicPrintConfig; }
 class TextInput;
 class StaticLine;
 class CheckBox;
-class MultiSwitchButton;

 namespace Slic3r { namespace GUI {

@@ -196,10 +195,6 @@ private:
        ScalableBitmap icon_bmp;      // tab icon next to the title; rescaled on DPI change
        wxPanel* page{nullptr};
        TabCtrl* tabs{nullptr};
-        // Printer section with several extruders: the extruder switch shown instead of `tabs`, the
-        // same MultiSwitchButton (and option names) as the printer tab's Extruder page. One option
-        // per entry of `categories`, named by its title; `tabs` stays as the hidden selection model.
-        MultiSwitchButton* variant_switch{nullptr};
        // Second tab strip, below the main one, listing only the mixed-color filament slots.
        // Present on the Material section only (null elsewhere).
        TabCtrl* mixed_tabs{nullptr};
@@ -282,8 +277,6 @@ private:
    bool row_is_visible(const Row& row) const;
    void apply_visibility();
    void bind_tab_events();
-    // Replaces a section's inner tab strip with a variant switch (see SectionGroup::variant_switch).
-    void setup_variant_switch(size_t section_index);

    TabCtrl* m_outer_tabs{nullptr};
    wxPanel* m_outer_host{nullptr};
@@ -811,12 +811,6 @@ wxString Tab::translate_category(const wxString& title, Preset::Type preset_type
        }
        return _("Extruder") + title.SubString(8, title.Last());
    }
-    // Orca: one "Extruder" page serves all extruders; name it "Extruders" when there are several.
-    if (preset_type == Preset::TYPE_PRINTER && title == "Extruder") {
-        auto preset = wxGetApp().preset_bundle;
-        if (preset && preset->get_printer_extruder_count() > 1)
-            return _("Extruders");
-    }
    return _(title);
 }

@@ -1159,38 +1153,6 @@ std::string Tab::options_list_storage_key(const std::string& opt_key) const
    return (serialized || is_plugin_field) ? opt_key : opt_key + "#0";
 }

-// Orca: deep_diff() flags every vector entry at or past the reference vector's length as changed,
-// whatever its value (e.g. the values of an extruder added by raising the extruder count). A vector
-// grows by copying its first entry (ConfigOptionVector::resize), so such an entry only counts as
-// changed when it differs from the reference's first entry, as before Orca's deep_diff() change.
-// The change of the count itself shows on "extruders_count".
-static void drop_unchanged_added_entries(std::vector<std::string> &options, const DynamicPrintConfig &current, const Preset *reference)
-{
-    if (reference == nullptr)
-        return;
-    // deep_diff() lists a key's entries one after another, so serialize each key's vectors once.
-    std::string              serialized_key;
-    std::vector<std::string> cur_values;
-    std::string              ref_first;
-    options.erase(std::remove_if(options.begin(), options.end(), [&](const std::string &opt) {
-        const auto pos = opt.find('#');
-        if (pos == std::string::npos)
-            return false;
-        const std::string key = opt.substr(0, pos);
-        const size_t      idx = size_t(std::atoi(opt.c_str() + pos + 1));
-        auto ref = dynamic_cast<const ConfigOptionVectorBase *>(reference->config.option(key));
-        auto cur = dynamic_cast<const ConfigOptionVectorBase *>(current.option(key));
-        if (ref == nullptr || cur == nullptr || idx < ref->size() || ref->size() == 0 || idx >= cur->size())
-            return false;
-        if (key != serialized_key) {
-            serialized_key = key;
-            cur_values     = cur->vserialize();
-            ref_first      = ref->vserialize().front();
-        }
-        return cur_values[idx] == ref_first;
-    }), options.end());
-}
-
 void Tab::update_all_extruder_options_status()
 {
    if (!m_extruder_switch && !m_variant_combo) {
@@ -1221,8 +1183,6 @@ void Tab::update_all_extruder_options_status()

    auto dirty_options = m_presets->current_dirty_options(true);
    auto nonsys_options = m_presets->current_different_from_parent_options(true);
-    if (m_type == Preset::TYPE_PRINTER)
-        update_custom_dirty(dirty_options, nonsys_options);
    auto filter_extruder_options = [](const std::vector<std::string>& options) {
        std::vector<std::string> filtered_options;
        for (const auto& opt : options) {
@@ -1271,7 +1231,7 @@ void Tab::update_extruder_switch_colors()

        if (m_active_page) {
            if (m_active_page->title() == "Speed" || m_active_page->title() == "Motion ability" || m_active_page->title() == "Filament" ||
-                m_active_page->title() == "Setting Overrides" || m_active_page->title() == "Multimaterial" || is_printer_extruder_page(m_active_page)) {
+                m_active_page->title() == "Setting Overrides" || m_active_page->title() == "Multimaterial") {
                for (auto page_ptr : m_pages) {
                    if (page_ptr.get() == m_active_page) {
                        pages_to_check.push_back(page_ptr);
@@ -1302,8 +1262,8 @@ void Tab::update_extruder_switch_colors()
 void Tab::check_extruder_options_status(int index, bool &sys_extruder, bool &modified_extruder, const std::vector<PageShp>& pages_to_check)
 {
    int config_index = index;
-    int extruder_id  = index;
    if (m_type == Preset::TYPE_PRINT || m_type == Preset::TYPE_PRINTER || m_type == Preset::TYPE_MODEL) {
+        int extruder_id;
        NozzleVolumeType nozzle_type;
        parse_extruder_selection(index, extruder_id, nozzle_type);

@@ -1336,10 +1296,6 @@ void Tab::check_extruder_options_status(int index, bool &sys_extruder, bool &mod
                }

                std::string target_opt_key = base_opt_key + "#" + std::to_string(config_index * stride);
-                // Orca: on the printer's Extruder page only per-variant options use the variant column,
-                // the others (nozzle_diameter, extruder_offset, ...) are indexed by the extruder.
-                if (is_printer_extruder_page(page.get()) && printer_options_with_variant_1.count(base_opt_key) == 0)
-                    target_opt_key = base_opt_key + "#" + std::to_string(extruder_id);

                auto status_iter = m_all_extruder_options_status.find(target_opt_key);
                if (status_iter != m_all_extruder_options_status.end()) {
@@ -1380,6 +1336,18 @@ void TabPrinter::init_options_list()
    Tab::init_options_list();
    if (m_printer_technology == ptFFF)
        m_options_list.emplace("extruders_count", m_opt_status_value);
+    for (size_t i = 1; i < m_extruders_count; ++i) {
+        wxString target_title = wxString::Format("Extruder %d", int(i + 1));
+        for (auto &page : m_pages) {
+            if (page->title() == target_title) {
+                for (auto group : page->m_optgroups) {
+                    for (auto &opt : group->opt_map())
+                        m_options_list.emplace(opt.first, m_opt_status_value);
+                }
+                break;
+            }
+        }
+    }
 }

 void TabPrinter::msw_rescale()
@@ -1469,7 +1437,7 @@ void Tab::update_changed_tree_ui()
                    get_sys_and_mod_flags("compatible_printers", sys_page, modified_page);
                }
            }
-            if (page->title() == "Speed" || page->title() == "Motion ability" || page->title() == "Filament" || page->title() == "Setting Overrides" || page->title() == "Multimaterial" || is_printer_extruder_page(page.get())) {
+            if (page->title() == "Speed" || page->title() == "Motion ability" || page->title() == "Filament" || page->title() == "Setting Overrides" || page->title() == "Multimaterial") {
                auto options = generate_extruder_options();
                for (size_t switch_index = 0; switch_index < options.size(); ++switch_index) {
                    std::vector<PageShp> pages_to_check = { page };
@@ -1572,10 +1540,6 @@ void Tab::on_roll_back_value(const bool to_sys /*= true*/)

    m_postpone_update_ui = false;

-    // Orca: the restored config may have another extruder count than the tab shows.
-    if (auto printer_tab = dynamic_cast<TabPrinter *>(this))
-        printer_tab->sync_extruders_count();
-
    // When all values are rolled, then we have to update whole tab in respect to the reverted values
    update();
    if (m_active_page)
@@ -1913,17 +1877,6 @@ static wxString pad_combo_value_for_config(const DynamicPrintConfig &config)
    return config.opt_bool("pad_enable") ? (config.opt_bool("pad_around_object") ? _("Around object") : _("Below object")) : _("None");
 }

-// Rebuilds the variant switch of every tab that has one, e.g. after the extruder count or a nozzle volume type changed.
-static void update_all_extruder_variants(int extruder_idx = -1)
-{
-    for (auto tab : wxGetApp().tabs_list)
-        tab->update_extruder_variants(extruder_idx);
-    if (auto tab = wxGetApp().plate_tab)
-        tab->update_extruder_variants(extruder_idx);
-    for (auto tab : wxGetApp().model_tabs_list)
-        tab->update_extruder_variants(extruder_idx);
-}
-
 void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
 {
    // Orca:
@@ -2366,7 +2319,15 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)

    if (opt_key.find("nozzle_volume_type") != std::string::npos) {
        int extruder_idx = std::atoi(opt_key.substr(opt_key.find_last_of('#') + 1).c_str());
-        update_all_extruder_variants(extruder_idx);
+        for (auto tab : wxGetApp().tabs_list) {
+            tab->update_extruder_variants(extruder_idx);
+        }
+        if (auto tab = wxGetApp().plate_tab) {
+            tab->update_extruder_variants(extruder_idx);
+        }
+        for (auto tab : wxGetApp().model_tabs_list) {
+            tab->update_extruder_variants(extruder_idx);
+        }
        if (wxGetApp().app_config->get("auto_calculate_flush") == "all") {
            wxGetApp().plater()->sidebar().auto_calc_flushing_volumes(-1,extruder_idx);
        }
@@ -5724,13 +5685,9 @@ if (is_marlin_flavor)
            size_t extruders_count = size_t(boost::any_cast<int>(v));
            wxTheApp->CallAfter([this, opt_key, value, extruders_count]() {
                if (opt_key == "extruders_count" || opt_key == "single_extruder_multi_material") {
-                    const size_t old_extruders_count = m_extruders_count;
                    extruders_count_changed(extruders_count);
                    init_options_list(); // m_options_list should be updated before UI updating
                    update_dirty();
-                    // Orca: the variant switches (here, Process in the sidebar, ...) list one option per extruder.
-                    if (m_extruders_count != old_extruders_count)
-                        update_all_extruder_variants();
                    if (opt_key == "single_extruder_multi_material") { // the single_extruder_multimaterial was added to force pages
                        on_value_change(opt_key, value);                      // rebuild - let's make sure the on_value_change is not skipped

@@ -5740,7 +5697,6 @@ if (is_marlin_flavor)
 // Orca: we use a different logic here. If SEMM is enabled, we set extruder count to 1.
 #if 1
                            extruders_count_changed(1);
-                            update_all_extruder_variants();
 #else

                            std::vector<double> nozzle_diameters =
@@ -5812,13 +5768,14 @@ if (is_marlin_flavor)
        m_pages.insert(m_pages.end() - n_after_single_extruder_MM, page);
    }

-    // Orca: a single "Extruder" page serves all extruders. Its controls are created once for extruder 0;
-    // switch_excluder() re-targets them to the extruder selected on the variant switch (m_extruder_switch),
-    // which the printer tab shows on this page too.
-    if (extruder_page() == nullptr && m_extruders_count > 0) {
-        const size_t extruder_idx = 0;
-        auto page = add_options_page(L("Extruder"), "custom-gcode_extruder", true); // ORCA: icon only visible on placeholders
-        m_pages.insert(m_pages.begin() + n_before_extruders, page);
+    // Orca: build missed extruder pages
+    for (auto extruder_idx = m_extruders_count_old; extruder_idx < m_extruders_count; ++extruder_idx) {
+        const wxString& page_name = (m_extruders_count > 1) ? wxString::Format("Extruder %d", int(extruder_idx + 1)) : wxString::Format("Extruder");
+
+        //# build page
+        //const wxString& page_name = wxString::Format("Extruder %d", int(extruder_idx + 1));
+        auto page = add_options_page(page_name, "custom-gcode_extruder", true); // ORCA: icon only visible on placeholders
+        m_pages.insert(m_pages.begin() + n_before_extruders + extruder_idx, page);

        auto optgroup = page->new_optgroup(L("Basic information"), L"param_information", -1, true);
            optgroup->append_single_option_line("nozzle_diameter", "printer_extruder_basic_information#nozzle-diameter", extruder_idx);
@@ -5831,10 +5788,8 @@ if (is_marlin_flavor)
            option.opt.full_width = true;
            optgroup->append_single_option_line(option, "printer_extruder_basic_information#extruder-offset-position");

-            optgroup->m_on_change = [this](const t_config_option_key& opt_key, boost::any value)
+            optgroup->m_on_change = [this, extruder_idx](const t_config_option_key& opt_key, boost::any value)
            {
-                // The page edits the extruder selected on the variant switch.
-                const size_t extruder_idx = size_t(get_current_active_extruder());
                bool is_SEMM = m_config->opt_bool("single_extruder_multi_material");
                if (is_SEMM && m_extruders_count > 1 && boost::starts_with(opt_key, "nozzle_diameter"))
                {
@@ -5929,22 +5884,22 @@ if (is_marlin_flavor)
            //optgroup->append_line(line);
 #endif
    }
-
-    // The page holds only the "#0" controls, so register every extruder's options with the search
-    // index under "Extruder N"; a search hit selects that extruder (TabPrinter::activate_option()).
-    if (Page *page = extruder_page()) {
-        auto &index = wxGetApp().sidebar().settings_index();
-        for (auto &group : page->m_optgroups) {
-            group->set_config_category_and_type(page->title(), m_type);
-            for (auto &opt : group->opt_map()) {
-                if (opt.second.second < 0)
-                    continue;
-                for (size_t i = 0; i < m_extruders_count; ++i) {
-                    const wxString category = m_extruders_count > 1 ? wxString::Format("Extruder %d", int(i + 1)) : wxString("Extruder");
-                    index.add_key(opt.second.first + "#" + std::to_string(i), m_type, group->title, category, group->icon);
-                }
-            }
-        }
+    // BBS. No extra extruder page for single physical extruder machine
+    // # remove extra pages
+    auto &first_extruder_title = const_cast<wxString &>(m_pages[n_before_extruders]->title());
+    if (m_extruders_count < m_extruders_count_old) {
+        m_pages.erase(	m_pages.begin() + n_before_extruders + m_extruders_count,
+                        m_pages.begin() + n_before_extruders + m_extruders_count_old);
+        if (m_extruders_count == 1)
+            first_extruder_title = wxString::Format("Extruder");
+    } else if (m_extruders_count_old == 1) {
+        first_extruder_title = wxString::Format("Extruder %d", 1);
+    }
+    auto & index = wxGetApp().sidebar().settings_index();
+    for (auto &group : m_pages[n_before_extruders]->m_optgroups) {
+        group->set_config_category_and_type(first_extruder_title, m_type);
+        for (auto &opt : group->opt_map())
+            index.add_key(opt.first + "#0", m_type, group->title, first_extruder_title, group->icon);
    }

    Thaw();
@@ -6225,6 +6180,12 @@ void TabPrinter::toggle_options()
        return;

    auto nozzle_volumes = m_preset_bundle->project_config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type");
+    auto extruders      = m_config->option<ConfigOptionEnumsGeneric>("extruder_type");
+        auto get_index_for_extruder =
+            [this, &extruders](int extruder_id, int stride = 1) {
+        return m_config->get_index_for_extruder(extruder_id + 1, "printer_extruder_id",
+            ExtruderType(extruders->values[extruder_id]), get_actual_nozzle_volume_type(extruder_id), "printer_extruder_variant", stride);
+    };

    //BBS: whether the preset is Bambu Lab printer
    bool is_BBL_printer = false;
@@ -6299,13 +6260,14 @@ void TabPrinter::toggle_options()
        toggle_option("tool_change_on_wipe_tower", !bSEMM && supports_wipe_tower_2 && extruders_count > 1);
        toggle_option("wait_for_temp_on_wipe_tower", !bSEMM && supports_wipe_tower_2 && extruders_count > 1);
    }
-    if (m_active_page->title() == L("Extruder") && m_extruders_count > 0)
+    wxString extruder_number;
+    long val = 1;
+    if ( m_active_page->title().IsSameAs(L("Extruder")) ||
+        (m_active_page->title().StartsWith("Extruder ", &extruder_number) && extruder_number.ToLong(&val) &&
+        val > 0 && (size_t)val <= m_extruders_count))
    {
-        // Orca: the single Extruder page edits the extruder selected on the variant switch; its
-        // controls carry field index 0 (i), the values are read for `extruder`.
-        const size_t i        = 0;
-        const size_t extruder = std::min<size_t>(size_t(get_current_active_extruder()), m_extruders_count - 1);
-        const int    variant_index = extruder_variant_index(int(extruder));
+        size_t i = size_t(val - 1);
+        int variant_index = get_index_for_extruder(i);
        bool have_retract_length = m_config->opt_float("retraction_length", variant_index) > 0;

        toggle_option("extruder_printable_area", false, i);          // disable
@@ -6332,7 +6294,7 @@ void TabPrinter::toggle_options()
        vec.resize(0);
        vec = {"retract_lift_above", "retract_lift_below", "retract_lift_enforce"};
        for (auto el : vec)
-          toggle_option(el, retraction && (m_config->opt_float("z_hop", variant_index) > 0), i);
+          toggle_option(el, retraction && (m_config->opt_float("z_hop", i) > 0), i);

        // some options only apply when not using firmware retraction
        vec.resize(0);
@@ -6385,7 +6347,7 @@ void TabPrinter::toggle_options()
        toggle_option("long_retractions_when_cut", !use_firmware_retraction && m_config->opt_int("enable_long_retraction_when_cut"), i);
        toggle_line("retraction_distances_when_cut", m_config->opt_bool("long_retractions_when_cut", variant_index), i);

-        toggle_option("travel_slope", m_config->opt_enum("z_hop_types", variant_index) != ZHopType::zhtNormal, i);
+        toggle_option("travel_slope", m_config->opt_enum("z_hop_types", i) != ZHopType::zhtNormal, i);
    }

    if (m_active_page->title() == L("Motion ability")) {
@@ -6459,16 +6421,12 @@ void TabPrinter::on_value_change(const std::string& opt_key, const boost::any& v
        return;

    const int pos = opt_key.find("#");
-    // Orca: fields of the single Extruder page keep index 0 but edit the selected extruder.
-    const int data_idx = pos > 0 ? extruder_page_data_index(opt_key) : -1;

    if (pos > 0) {
        std::string temp_str = opt_key;
        boost::erase_head(temp_str, pos + 1);
        int orig_opt_idx = static_cast<size_t>(atoi(temp_str.c_str()));
        int opt_idx = orig_opt_idx >= 0 ? orig_opt_idx : 0;
-        if (data_idx >= 0)
-            opt_idx = data_idx;

        std::string opt_key_pure = opt_key;
        boost::erase_tail(opt_key_pure, opt_key_pure.size() - pos);
@@ -6503,12 +6461,7 @@ void TabPrinter::on_value_change(const std::string& opt_key, const boost::any& v
        }
    }

-    // Orca: report Extruder page changes as "key#<extruder>", as the former "Extruder N" pages did,
-    // so per-extruder handling in Tab::on_value_change() sees the extruder that was edited.
-    if (data_idx >= 0)
-        Tab::on_value_change(opt_key.substr(0, pos) + "#" + std::to_string(get_current_active_extruder()), value);
-    else
-        Tab::on_value_change(opt_key, value);
+    Tab::on_value_change(opt_key, value);
 }

 void TabPrinter::update()
@@ -7440,7 +7393,12 @@ bool Tab::tree_sel_change_delayed(wxCommandEvent& event)
        // update_undo_buttons();
        this->OnActivate();
        m_parent->set_active_tab(this);
-        update_variant_sizer_visibility();
+        if (m_variant_sizer) {
+            wxWindow *variant_ctrl = m_extruder_switch ? (wxWindow *) m_extruder_switch : m_variant_combo;
+            m_main_sizer->Show(m_variant_sizer, variant_ctrl->IsThisEnabled() && !m_active_page->m_opt_id_map.empty() && !m_active_page->title().StartsWith("Extruder "));
+            if (m_extruder_sync) m_extruder_sync->Show(variant_ctrl->IsShown());
+            GetParent()->Layout();
+        }

        m_page_view->Thaw();
        return false;
@@ -7451,7 +7409,12 @@ bool Tab::tree_sel_change_delayed(wxCommandEvent& event)
        return false;

    m_active_page = page;
-    update_variant_sizer_visibility();
+    if (m_variant_sizer) {
+        wxWindow *variant_ctrl = m_extruder_switch ? (wxWindow *) m_extruder_switch : m_variant_combo;
+        m_main_sizer->Show(m_variant_sizer, variant_ctrl->IsThisEnabled() && !m_active_page->m_opt_id_map.empty() && !m_active_page->title().StartsWith("Extruder"));
+        if (m_extruder_sync) m_extruder_sync->Show(variant_ctrl->IsShown());
+        GetParent()->Layout();
+    }

    auto throw_if_canceled = std::function<void()>([this](){
 #ifdef WIN32
@@ -8277,11 +8240,9 @@ void Tab::update_extruder_variants(int extruder_id, bool reload)
        m_actual_nozzle_volumes.resize(extruder_nums, NozzleVolumeType::nvtStandard);
        for (int i = 0; i < extruder_nums; i++) m_actual_nozzle_volumes[i] = (NozzleVolumeType)nozzle_volumes->values[i];

-        // Orca: when every extruder uses the same variant (e.g. a non-Bambu dual-nozzle printer), the
-        // switch has no nozzle variants to select and nothing to sync. The printer tab still enables it
-        // to choose the extruder its Extruder and Motion ability pages edit.
-        m_extruder_switch_variants = extruder_nums >= 2 && m_preset_bundle->support_different_extruders();
-        if (m_extruder_switch_variants || (m_type == Preset::TYPE_PRINTER && extruder_nums >= 2)) {
+        // Orca: a non-Bambu dual-nozzle printer has two extruders but a single variant column, so
+        // the nozzle switch and sync button have nothing to act on. Only enable with real variants.
+        if (extruder_nums >= 2 && m_preset_bundle->support_different_extruders()) {
            auto options = generate_extruder_options();
            m_extruder_switch->SetOptions(options);

@@ -8320,8 +8281,12 @@ void Tab::update_extruder_variants(int extruder_id, bool reload)
    if (m_type == Preset::TYPE_PRINT) {
        update_pages_with_multi_variant();
    }
-    update_extruder_switch_colors();
-    update_variant_sizer_visibility();
+    if (m_variant_sizer) {
+        wxWindow *variant_ctrl = m_extruder_switch ? (wxWindow *) m_extruder_switch : m_variant_combo;
+        m_main_sizer->Show(m_variant_sizer, variant_ctrl->IsThisEnabled() && m_active_page && !m_active_page->m_opt_id_map.empty() && !m_active_page->title().StartsWith("Extruder "));
+        if (m_extruder_sync) m_extruder_sync->Show(variant_ctrl->IsShown());
+        GetParent()->Layout();
+    }
 }

 // The variant switch tags are the narrowest place a volume type is named, so they abbreviate it;
@@ -8396,21 +8361,12 @@ std::vector<wxString> Tab::generate_extruder_options()
        return options;
    }

-    // Orca: the printer tab has one tag per extruder, named as its former "Extruder N" pages were.
-    // parse_extruder_selection() counts a hybrid extruder as two tags; that still lines up because
-    // only the last extruder can be hybrid.
-    if (m_type == Preset::TYPE_PRINTER) {
-        for (int i = 0; i < extruder_nums; ++i)
-            options.push_back(translate_category(wxString::Format("Extruder %d", i + 1), m_type));
-        return options;
-    }
-
    std::string pt = m_preset_bundle->printers.get_edited_preset().get_printer_type(m_preset_bundle);
-    // Orca: the main/deputy toolhead names describe a Bambu dual-nozzle printer, where extruder 0 is
-    // the left (deputy) and extruder 1 the right (main) nozzle. Other printers number their tools.
-    const bool toolhead_names = extruder_nums == 2 && m_preset_bundle->is_bbl_vendor();
+    // Orca: the main/deputy toolhead names describe a dual-nozzle printer, where extruder 0 is the
+    // left (deputy) and extruder 1 the right (main) nozzle. From three extruders on the tools are
+    // interchangeable, so name them by index instead of repeating one side.
    for (int i = 0; i < extruder_nums; ++i) {
-        wxString extruder_name = !toolhead_names ? wxString::Format("T%d", i + 1) :
+        wxString extruder_name = extruder_nums > 2 ? wxString::Format("T%d", i + 1) :
                                                     _L(DevPrinterConfigUtil::get_toolhead_display_name(
                                                         pt, (i == 0) ? DEPUTY_EXTRUDER_ID : MAIN_EXTRUDER_ID,
                                                         ToolHeadComponent::Nozzle, ToolHeadNameCase::TitleCase, true));
@@ -8427,71 +8383,6 @@ std::vector<wxString> Tab::generate_extruder_options()
    return options;
 }

-Page *TabPrinter::extruder_page() const
-{
-    for (const PageShp &page : m_pages)
-        if (page->title() == "Extruder")
-            return page.get();
-    return nullptr;
-}
-
-int TabPrinter::extruder_page_data_index(const std::string &field_id) const
-{
-    if (Page *page = extruder_page())
-        for (const auto &group : page->m_optgroups)
-            if (auto it = group->opt_map().find(field_id); it != group->opt_map().end())
-                return it->second.second;
-    return -1;
-}
-
-int TabPrinter::extruder_variant_index(int extruder)
-{
-    const auto *extruders = m_config->option<ConfigOptionEnumsGeneric>("extruder_type");
-    const int   index     = extruder < int(extruders->size()) ?
-                                m_config->get_index_for_extruder(extruder + 1, "printer_extruder_id", ExtruderType(extruders->values[extruder]),
-                                                                 get_actual_nozzle_volume_type(extruder), "printer_extruder_variant") :
-                                -1;
-    return index < 0 ? extruder : index;
-}
-
-void TabPrinter::update_custom_dirty(std::vector<std::string> &dirty_options, std::vector<std::string> &nonsys_options)
-{
-    drop_unchanged_added_entries(dirty_options, *m_config, &m_presets->get_selected_preset());
-    drop_unchanged_added_entries(nonsys_options, *m_config, m_presets->get_selected_preset_parent());
-}
-
-void TabPrinter::sync_extruders_count()
-{
-    if (m_printer_technology != ptFFF)
-        return;
-    const auto *nozzle_diameter = m_config->option<ConfigOptionFloats>("nozzle_diameter");
-    if (nozzle_diameter == nullptr || nozzle_diameter->size() == m_extruders_count)
-        return;
-    extruders_count_changed(nozzle_diameter->size());
-    init_options_list();
-    update_all_extruder_variants();
-}
-
-void TabPrinter::activate_option(const std::string &opt_key, const wxString &category)
-{
-    wxString number;
-    long     n = 0;
-    const bool numbered = category.StartsWith("Extruder ", &number) && number.ToLong(&n);
-    if (extruder_page() == nullptr || (!numbered && category != "Extruder")) {
-        Tab::activate_option(opt_key, category);
-        return;
-    }
-
-    // Selecting fires the switch's event, which re-targets the page (switch_excluder()).
-    const int extruder_idx = (n >= 1 && n <= long(m_extruders_count)) ? int(n - 1) : 0;
-    if (m_extruder_switch && m_extruder_switch->IsThisEnabled() && extruder_idx != get_current_active_extruder())
-        m_extruder_switch->SetSelection(calculate_selection_index_for_extruder(extruder_idx, get_actual_nozzle_volume_type(extruder_idx)));
-
-    // The page's controls are created for index 0.
-    const auto pos = opt_key.find('#');
-    Tab::activate_option(pos == std::string::npos ? opt_key : opt_key.substr(0, pos) + "#0", "Extruder");
-}
-
 NozzleVolumeType Tab::get_actual_nozzle_volume_type(int extruder_id)
 {
    int extruder_count = m_preset_bundle->get_printer_extruder_count();
@@ -8568,44 +8459,18 @@ bool Tab::get_extruder_sync_enable_state(int extruder_id)
    return false;
 }

-bool Tab::variant_switch_active() const
-{
-    if (m_extruder_switch)
-        return m_extruder_switch->IsThisEnabled();
-    return m_variant_combo && m_variant_combo->IsThisEnabled();
-}
-
-void Tab::update_variant_sizer_visibility()
-{
-    if (!m_variant_sizer)
-        return;
-    const bool show = variant_switch_active() && m_active_page && !m_active_page->m_opt_id_map.empty();
-    m_main_sizer->Show(m_variant_sizer, show);
-    if (m_extruder_sync) {
-        m_extruder_sync->Show(show);
-        // Orca: copying between extruders is offered only between nozzle variants, and not on the Extruder page.
-        m_extruder_sync->Enable(m_extruder_switch_variants && !is_printer_extruder_page(m_active_page) &&
-                                get_extruder_sync_enable_state(get_current_active_extruder()));
-    }
-    GetParent()->Layout();
-}
-
 void Tab::switch_excluder(int extruder_id, bool reload)
 {
    Preset & printer_preset = m_preset_bundle->printers.get_edited_preset();
    auto nozzle_volumes = m_preset_bundle->project_config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type");
    auto extruders      = printer_preset.config.option<ConfigOptionEnumsGeneric>("extruder_type");

-    // Orca: the printer tab re-targets its pages to the extruder selected on the switch. Resolved before
-    // the range check below, which keeps the extruder_type read in get_index_for_extruder in range.
-    if (m_type == Preset::TYPE_PRINTER && extruder_id == -1)
-        extruder_id = get_current_active_extruder();
    if (!m_variant_combo && (extruder_id >= (int)nozzle_volumes->size() || extruder_id >= (int)extruders->size()))
        extruder_id = 0;
    if (m_extruder_switch) {
        int current_extruder = get_current_active_extruder();
        bool sync_enable = get_extruder_sync_enable_state(current_extruder);
-        m_extruder_sync->Enable(m_extruder_switch_variants && sync_enable && !is_printer_extruder_page(m_active_page));
+        m_extruder_sync->Enable(m_extruder_switch->IsThisEnabled() && sync_enable);
        m_extruder_sync->Show();
        if (m_type != Preset::TYPE_PRINTER) {
            if (extruder_id == -1)
@@ -8632,26 +8497,24 @@ void Tab::switch_excluder(int extruder_id, bool reload)
        return;
    if (m_extruder_switch) m_extruder_switch->SetClientData(reinterpret_cast<void*>(static_cast<std::uintptr_t>(index)));
    if (m_variant_combo) m_variant_combo->SetClientData(reinterpret_cast<void *>(static_cast<std::uintptr_t>(index)));
+    wxWindow *variant_ctrl = m_extruder_switch ? (wxWindow *) m_extruder_switch : m_variant_combo;
    for (auto page : m_pages) {
        bool is_extruder = false;
-        int  page_index  = index;
        if (m_type == Preset::TYPE_PRINTER) {
-            if (page->title() == "Extruder")
+            if (page->title().StartsWith("Extruder")) {
+                int extruder_id2 = std::atoi(page->title().Mid(9).ToUTF8()) - 1;
+                if (extruder_id >= 0 && extruder_id2 != extruder_id)
+                    continue;
+                if (extruder_id2 > 0)
+                    index = get_index_for_extruder(extruder_id2);
                is_extruder = true;
-            else if (page->title().StartsWith("Motion ability"))
-                page_index = get_index_for_extruder(extruder_id == -1 ? 0 : extruder_id, 2);
+            } else if (page->title().StartsWith("Motion ability")) {
+                index = get_index_for_extruder(extruder_id == -1 ? 0 : extruder_id, 2);
+            }
        }
        page->m_opt_id_map.clear();
        for (auto group : page->m_optgroups) {
            for (auto &opt : group->opt_map()) {
-                if (is_extruder && opt.second.second >= 0) {
-                    // Per-variant options use the variant column, the others (nozzle_diameter,
-                    // extruder_offset, ...) are sized by the extruder count and use the extruder.
-                    const int idx = printer_options_with_variant_1.count(opt.second.first) > 0 ? page_index : extruder_id;
-                    const_cast<int &>(opt.second.second) = idx;
-                    page->m_opt_id_map.insert({opt.second.first + "#" + std::to_string(idx), opt.first});
-                    continue;
-                }
                auto iter = std::find(printer_extruder_options.begin(), printer_extruder_options.end(), opt.second.first);
                if (iter != printer_extruder_options.end()) {
                    page->m_opt_id_map.insert({opt.first, opt.first});
@@ -8659,9 +8522,9 @@ void Tab::switch_excluder(int extruder_id, bool reload)
                }

                if (opt.second.second >= 0) {
-                    const_cast<int &>(opt.second.second) = page_index;
-                    page->m_opt_id_map.insert({opt.second.first + "#" + std::to_string(page_index), opt.first});
-                    group->draw_multi_extruder = variant_switch_active();
+                    const_cast<int &>(opt.second.second) = index;
+                    page->m_opt_id_map.insert({opt.second.first + "#" + std::to_string(index), opt.first});
+                    group->draw_multi_extruder = !is_extruder && variant_ctrl->IsThisEnabled();
                }
            }
        }
@@ -331,10 +331,6 @@ public:
    MultiSwitchButton *  m_variant_combo   = nullptr;
    ScalableButton *m_extruder_sync   = nullptr;
 	wxPanel *       m_extruder_sync_box  = nullptr;
-    // Orca: whether m_extruder_switch switches nozzle variants (it then offers sync between them).
-    // The printer tab also enables the switch for printers without variants, to choose the extruder
-    // its Extruder and Motion ability pages edit.
-    bool            m_extruder_switch_variants = false;
    std::vector<NozzleVolumeType> m_actual_nozzle_volumes;

 public:
@@ -391,13 +387,6 @@ public:
    void        update_changed_tree_ui();
 	void		update_undo_buttons();
    void        update_extruder_switch_colors();
-    // Whether the variant switch (m_extruder_switch / m_variant_combo) is enabled: on the printer tab for
-    // any multi-extruder printer, on the other tabs when it switches nozzle variants.
-    bool        variant_switch_active() const;
-    // Orca: whether `page` is the printer tab's single "Extruder" page, which edits the extruder selected on the switch.
-    bool        is_printer_extruder_page(const Page* page) const { return m_type == Preset::TYPE_PRINTER && page && page->title() == "Extruder"; }
-    // Shows the variant switch row on pages with options that follow it.
-    void        update_variant_sizer_visibility();
    void        update_all_extruder_options_status();
    void        check_extruder_options_status(int index, bool &sys_extruder, bool &modified_extruder, const std::vector<PageShp>& pages_to_check);

@@ -455,7 +444,7 @@ public:
 	virtual void    on_value_change(const std::string& opt_key, const boost::any& value);

    void            update_wiping_button_visibility();
-	virtual void	activate_option(const std::string& opt_key, const wxString& category);
+	void			activate_option(const std::string& opt_key, const wxString& category);
    void			apply_searcher();
 	void			cache_config_diff(const std::vector<std::string>& selected_options, const DynamicPrintConfig* config = nullptr);
 	void			apply_config_from_cache();
@@ -721,25 +710,6 @@ public:
 	void		cache_extruder_cnt(const DynamicPrintConfig* config = nullptr);
 	bool		apply_extruder_cnt_from_cache();
 	void		refresh_printer_agent_dropdown() const;
-
-	// Orca: a single "Extruder" page for all extruders. Its controls are created once (index 0) and
-	// switch_excluder() re-targets them to the extruder selected on m_extruder_switch.
-	Page*		extruder_page() const;
-	// Config index an "Extruder" page field (e.g. "retraction_length#0") currently edits, -1 if not on that page.
-	int			extruder_page_data_index(const std::string& field_id) const;
-	// Config index of an extruder's per-variant options (Retraction, Z-Hop, ...): its variant column
-	// for the nozzle selected on the switch, or the extruder index on a printer without variants.
-	int			extruder_variant_index(int extruder);
-	// After the config was restored (roll back): follow its extruder count, if it differs.
-	void		sync_extruders_count();
-	// Search jump to "Extruder N" / "key#N": selects extruder N on the switch, then activates the
-	// page's own field on the "Extruder" page.
-	void		activate_option(const std::string& opt_key, const wxString& category) override;
-
-protected:
-	// Orca: values of extruders added by raising the extruder count have no saved / system value to
-	// revert to; the change is shown on "extruders_count", not on each of their parameters.
-	void		update_custom_dirty(std::vector<std::string> &dirty_options, std::vector<std::string> &nonsys_options) override;
 };

 class TabSLAMaterial : public Tab
@@ -596,8 +596,7 @@ PrintParams_Legacy BBLNetworkPlugin::as_legacy(PrintParams& param)
 }

 // Every PrintParams field except the four the 02.08.01 series added
-// (task_timelapse_use_internal, extruder_cali_manual_mode, svc_context, slicer_uid) and the
-// queue_plate_id 02.08.02 appended.
+// (task_timelapse_use_internal, extruder_cali_manual_mode, svc_context, slicer_uid).
 PrintParams_0203 BBLNetworkPlugin::as_0203(PrintParams& param)
 {
    PrintParams_0203 p;
@@ -336,7 +336,6 @@ struct PrintParams {
    bool            try_emmc_print;
    std::string     svc_context;
    std::string     slicer_uid;
-    std::string     queue_plate_id;
 };

 struct TaskQueryParams
@@ -413,7 +412,7 @@ enum class NetworkAbi {
    Unsupported, // no generation in this build can call it - never dispatch through it
    Legacy,      // 01.10.01: PrintParams_Legacy; send_message/send_message_to_printer take no flag
    V0203,       // 02.03.00: PrintParams_0203; bind takes no dev_model
-    Current,     // 02.08.04: the layouts and signatures this build declares directly
+    Current,     // 02.08.01: the layouts and signatures this build declares directly
 };

 struct NetworkLibraryVersion {
@@ -426,12 +425,10 @@ struct NetworkLibraryVersion {
 };

 // Every row names the generation that can call it, so a series can never be offered without a
-// host-side ABI for it. Series with no generation - 02.08.01 (whose PrintParams lacks the
-// queue_plate_id that 02.08.02 appended, and whose malformed bind table macOS 27 refuses to
-// load), 02.01.01, 02.00.02 and older - must stay out; is_supported_network_version() is the
-// gate that keeps them from loading.
+// host-side ABI for it. Series with no generation - 02.01.01, 02.00.02 and older - must stay out;
+// is_supported_network_version() is the gate that keeps them from loading.
 static const NetworkLibraryVersion AVAILABLE_NETWORK_VERSIONS[] = {
-    {"02.08.04", "02.08.04", nullptr, true, nullptr, NetworkAbi::Current},
+    {"02.08.01", "02.08.01", nullptr, true, nullptr, NetworkAbi::Current},
    {"02.03.00", "02.03.00", nullptr, false,
     "An older plug-in series. Features that need newer plug-in support, such as print-failure "
     "snapshots in the device error dialog, are unavailable.", NetworkAbi::V0203},
@@ -538,110 +538,6 @@ SCENARIO("update_diff_values_to_child_config keeps a child's values on variants
    }
 }

-SCENARIO("update_non_diff_values_to_base_config keeps a project's changed values on variants it does not list",
-         "[Config][Variant]") {
-    std::set<std::string> no_keys;
-    auto variants = [](std::initializer_list<std::string> names) { return new Slic3r::ConfigOptionStrings(names); };
-
-    GIVEN("A filament base with three variants") {
-        Slic3r::DynamicPrintConfig base;
-        base.set_key_value("filament_extruder_variant",
-            variants({"Direct Drive Standard", "Bowden Standard", "Direct Drive High Flow"}));
-        base.set_deserialize_strict("nozzle_temperature", "220,220,220");
-
-        WHEN("the project was saved when the base had only its first variant") {
-            Slic3r::DynamicPrintConfig project;
-            project.set_key_value("filament_extruder_variant", variants({"Direct Drive Standard"}));
-            project.set_deserialize_strict("nozzle_temperature", "199");
-
-            AND_WHEN("the project lists the value as changed") {
-                project.update_non_diff_values_to_base_config(base, project.keys(), {"nozzle_temperature"}, "", "filament_extruder_variant",
-                                                              Slic3r::filament_options_with_variant, no_keys);
-                THEN("the project's value applies to every variant") {
-                    REQUIRE(project.opt_serialize("nozzle_temperature") == "199,199,199");
-                }
-            }
-            AND_WHEN("the project does not list the value as changed") {
-                project.update_non_diff_values_to_base_config(base, project.keys(), {}, "", "filament_extruder_variant",
-                                                              Slic3r::filament_options_with_variant, no_keys);
-                THEN("the base's values replace it") {
-                    REQUIRE(project.opt_serialize("nozzle_temperature") == "220,220,220");
-                }
-            }
-        }
-        WHEN("the project lists every variant, in another order") {
-            Slic3r::DynamicPrintConfig project;
-            project.set_key_value("filament_extruder_variant",
-                variants({"Bowden Standard", "Direct Drive High Flow", "Direct Drive Standard"}));
-            project.set_deserialize_strict("nozzle_temperature", "190,205,199");
-            project.update_non_diff_values_to_base_config(base, project.keys(), {"nozzle_temperature"}, "", "filament_extruder_variant",
-                                                          Slic3r::filament_options_with_variant, no_keys);
-            THEN("each variant keeps its own value") {
-                REQUIRE(project.opt_serialize("nozzle_temperature") == "199,190,205");
-            }
-        }
-        WHEN("the project lists no variants") {
-            Slic3r::DynamicPrintConfig project;
-            project.set_deserialize_strict("nozzle_temperature", "199");
-            project.update_non_diff_values_to_base_config(base, project.keys(), {"nozzle_temperature"}, "", "filament_extruder_variant",
-                                                          Slic3r::filament_options_with_variant, no_keys);
-            THEN("the project's value applies to every variant") {
-                REQUIRE(project.opt_serialize("nozzle_temperature") == "199,199,199");
-            }
-        }
-    }
-
-    GIVEN("A two-extruder printer base with two variants per extruder") {
-        Slic3r::DynamicPrintConfig base;
-        base.set_key_value("printer_extruder_variant",
-            variants({"Direct Drive Standard", "Direct Drive High Flow", "Direct Drive Standard", "Direct Drive High Flow"}));
-        base.set_key_value("printer_extruder_id", new Slic3r::ConfigOptionInts({1, 1, 2, 2}));
-        base.set_deserialize_strict("retraction_length", "0.8,0.8,0.8,0.8");
-
-        WHEN("the project lists only the Standard variant of each extruder") {
-            Slic3r::DynamicPrintConfig project;
-            project.set_key_value("printer_extruder_variant", variants({"Direct Drive Standard", "Direct Drive Standard"}));
-            project.set_key_value("printer_extruder_id", new Slic3r::ConfigOptionInts({1, 2}));
-            project.set_deserialize_strict("retraction_length", "1.1,2.2");
-            project.update_non_diff_values_to_base_config(base, project.keys(), {"retraction_length"}, "printer_extruder_id", "printer_extruder_variant",
-                                                          Slic3r::printer_options_with_variant_1,
-                                                          Slic3r::printer_options_with_variant_2);
-            THEN("each extruder's High Flow variant takes that extruder's value") {
-                REQUIRE(project.opt_serialize("retraction_length") == "1.1,1.1,2.2,2.2");
-            }
-        }
-        WHEN("the project lists only the Standard variant of each extruder, and the variant lists as changed") {
-            Slic3r::DynamicPrintConfig project;
-            project.set_key_value("printer_extruder_variant", variants({"Direct Drive Standard", "Direct Drive Standard"}));
-            project.set_key_value("printer_extruder_id", new Slic3r::ConfigOptionInts({1, 2}));
-            project.set_deserialize_strict("machine_max_speed_x", "300,100,400,150");
-            base.set_deserialize_strict("machine_max_speed_x", "500,200,500,200,500,200,500,200");
-            project.update_non_diff_values_to_base_config(base, project.keys(),
-                                                          {"machine_max_speed_x", "printer_extruder_id", "printer_extruder_variant"},
-                                                          "printer_extruder_id", "printer_extruder_variant",
-                                                          Slic3r::printer_options_with_variant_1,
-                                                          Slic3r::printer_options_with_variant_2);
-            THEN("the variant lists are the base's") {
-                REQUIRE(project.opt_serialize("printer_extruder_variant") == base.opt_serialize("printer_extruder_variant"));
-                REQUIRE(project.opt_serialize("printer_extruder_id") == "1,1,2,2");
-            }
-            THEN("each extruder's High Flow variant takes that extruder's pair of limits") {
-                REQUIRE(project.opt_serialize("machine_max_speed_x") == "300,100,300,100,400,150,400,150");
-            }
-        }
-        WHEN("the project lists no variants") {
-            Slic3r::DynamicPrintConfig project;
-            project.set_deserialize_strict("retraction_length", "1.1");
-            project.update_non_diff_values_to_base_config(base, project.keys(), {"retraction_length"}, "printer_extruder_id", "printer_extruder_variant",
-                                                          Slic3r::printer_options_with_variant_1,
-                                                          Slic3r::printer_options_with_variant_2);
-            THEN("only the first extruder's variants take the project's value") {
-                REQUIRE(project.opt_serialize("retraction_length") == "1.1,1.1,0.8,0.8");
-            }
-        }
-    }
-}
-
 // SCENARIO("DynamicPrintConfig JSON serialization", "[Config]") {
 //     WHEN("DynamicPrintConfig is serialized and deserialized") {
 // 	auto now = std::chrono::high_resolution_clock::now();
@@ -799,67 +799,3 @@ TEST_CASE("A per-variant filament option read with a single value gives it to ev
    config.load_from_ini_string("pressure_advance = 0.021", ForwardCompatibilitySubstitutionRule::Disable);
    REQUIRE(config.option<ConfigOptionFloats>("pressure_advance")->values == std::vector<double>({0.021, 0.021, 0.021}));
 }
-
-// Machine limits (printer_options_with_variant_2) hold a (normal, silent) pair per printer variant, so the
-// printer Tab's Motion ability page can edit each extruder's own limits.
-TEST_CASE("set_num_extruders gives every printer variant its own pair of machine limits", "[Config]")
-{
-    DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
-    auto speed_x = [&config]() { return config.option<ConfigOptionFloats>("machine_max_speed_x")->values; };
-
-    SECTION("a new extruder's pair is padded with the first value, like the other variant keys") {
-        config.option<ConfigOptionFloats>("machine_max_speed_x")->values = {500., 200.};
-        config.set_num_extruders(3);
-        REQUIRE(config.option<ConfigOptionStrings>("printer_extruder_variant")->size() == 3);
-        REQUIRE(speed_x() == std::vector<double>({500., 200., 500., 500., 500., 500.}));
-    }
-
-    SECTION("per-extruder pairs are kept, and removing an extruder removes its pair") {
-        config.option<ConfigOptionFloats>("machine_max_speed_x")->values = {500., 200., 400., 150., 300., 100.};
-        config.set_num_extruders(3);
-        REQUIRE(speed_x() == std::vector<double>({500., 200., 400., 150., 300., 100.}));
-        config.set_num_extruders(2);
-        REQUIRE(speed_x() == std::vector<double>({500., 200., 400., 150.}));
-    }
-
-    SECTION("a printer with nozzle variants gets a pair per variant") {
-        // 2 extruders x 2 variants each = 4 variants
-        config.option<ConfigOptionStrings>("extruder_variant_list", true)->values = {"Direct Drive Standard,Direct Drive High Flow",
-                                                                                     "Direct Drive Standard,Direct Drive High Flow"};
-        const std::vector<double> per_variant = {500., 200., 510., 210., 520., 220., 530., 230.};
-        config.option<ConfigOptionFloats>("machine_max_speed_x")->values = per_variant;
-        config.set_num_extruders(2);
-        REQUIRE(speed_x() == per_variant);
-
-        config.option<ConfigOptionFloats>("machine_max_speed_x")->values = {500., 200.};
-        config.set_num_extruders(2);
-        REQUIRE(speed_x() == std::vector<double>({500., 200., 500., 500., 500., 500., 500., 500.}));
-    }
-}
-
-// The device drying options hold several values per filament, as many as each filament preset gives.
-TEST_CASE("The device drying options are rebuilt as each filament's values in slot order", "[Config]")
-{
-    DynamicPrintConfig two_values, one_value, no_value;
-    two_values.option<ConfigOptionStrings>("filament_dev_ams_drying_ams_limitations", true)->values = {"1", "0"};
-    two_values.option<ConfigOptionFloats>("filament_dev_ams_drying_temperature", true)->values     = {45., 45., 55., 55.};
-    one_value.option<ConfigOptionStrings>("filament_dev_ams_drying_ams_limitations", true)->values = {"1"};
-    one_value.option<ConfigOptionFloats>("filament_dev_ams_drying_temperature", true)->values      = {65., 65., 75., 75.};
-
-    // values a project stored for three other filaments
-    DynamicPrintConfig config;
-    config.option<ConfigOptionStrings>("filament_dev_ams_drying_ams_limitations", true)->values = {"0", "0", "0"};
-    config.option<ConfigOptionFloats>("filament_dev_chamber_drying_time", true)->values         = {12., 8., 12.};
-
-    set_filament_dev_options(config, {&two_values, &one_value, &two_values});
-    REQUIRE(config.option<ConfigOptionStrings>("filament_dev_ams_drying_ams_limitations")->values ==
-            std::vector<std::string>({"1", "0", "1", "1", "0"}));
-    REQUIRE(config.option<ConfigOptionFloats>("filament_dev_ams_drying_temperature")->values ==
-            std::vector<double>({45., 45., 55., 55., 65., 65., 75., 75., 45., 45., 55., 55.}));
-    // an option no filament defines keeps the stored values
-    REQUIRE(config.option<ConfigOptionFloats>("filament_dev_chamber_drying_time")->values == std::vector<double>({12., 8., 12.}));
-
-    // a filament without the option takes the option's default
-    set_filament_dev_options(config, {&two_values, &no_value});
-    REQUIRE(config.option<ConfigOptionStrings>("filament_dev_ams_drying_ams_limitations")->values == std::vector<std::string>({"1", "0", ""}));
-}
@@ -6228,9 +6228,8 @@ TEST_CASE("A per-variant project value maps onto its base preset's variant layou
                                                                   base_finder(&base, calls));
    CHECK(config.option<ConfigOptionStrings>("print_extruder_variant")->values ==
          std::vector<std::string>{"Direct Drive Standard", "Direct Drive High Flow"});
-    // The listed key keeps the project's Standard value, and High Flow, which the project does not
-    // list, takes it too, as a user preset's value does.
-    check_double_vector(config.option<ConfigOptionFloats>("outer_wall_speed")->values, {100., 100.});
+    // The listed key keeps the project's Standard value and takes High Flow from the base.
+    check_double_vector(config.option<ConfigOptionFloats>("outer_wall_speed")->values, {100., 300.});
    check_double_vector(config.option<ConfigOptionFloats>("inner_wall_speed")->values, {250., 350.});
 }

@@ -78,34 +78,31 @@ TEST_CASE("Series and managed classification", "[NetworkVersions]")

 TEST_CASE_METHOD(PluginFolderFixture, "Managed builds fold into the series; customs are surfaced", "[NetworkVersions]")
 {
-    add_plugin("02.08.04.60");          // managed, same series -> folded into the 02.08.04 row
+    add_plugin("02.08.01.55");          // managed, same series -> folded into the 02.08.01 row
    add_plugin("02.09.00.10");          // managed, unknown series -> not listed
-    add_plugin("02.08.01.55");          // managed, series this build no longer has an ABI for -> not listed
    add_plugin("02.03.00.62");          // managed, older whitelisted series -> folded into 02.03.00
    add_plugin("02.01.01.52");          // managed, series with no ABI in this build -> not listed
-    add_plugin("02.08.04_custom");      // custom, whitelisted series -> listed under it
-    add_plugin("02.08.04.52-dev");      // custom (dash-suffixed), whitelisted series -> listed
+    add_plugin("02.08.01_custom");      // custom, whitelisted series -> listed under it
+    add_plugin("02.08.01.52-dev");      // custom (dash-suffixed), whitelisted series -> listed

    auto versions = get_all_available_versions();

    // The specific managed build never gets its own row - the series represents it.
-    REQUIRE(count_version(versions, "02.08.04.60") == 0);
-    REQUIRE(count_version(versions, "02.08.04")    == 1);
-    REQUIRE(count_version(versions, "02.09.00.10") == 0);
    REQUIRE(count_version(versions, "02.08.01.55") == 0);
-    REQUIRE(count_version(versions, "02.08.01")    == 0);
+    REQUIRE(count_version(versions, "02.08.01")    == 1);
+    REQUIRE(count_version(versions, "02.09.00.10") == 0);
    REQUIRE(count_version(versions, "02.03.00.62") == 0);
    REQUIRE(count_version(versions, "02.03.00")    == 1);
    REQUIRE(count_version(versions, "02.01.01.52") == 0);
    // Custom-named builds are distinct files kept under their own name.
-    REQUIRE(count_version(versions, "02.08.04_custom")  == 1);
-    REQUIRE(count_version(versions, "02.08.04.52-dev")  == 1);
+    REQUIRE(count_version(versions, "02.08.01_custom")  == 1);
+    REQUIRE(count_version(versions, "02.08.01.52-dev")  == 1);

    // Newest series first, its customs nested under it (suffix sort: "" < ".52-dev" < "_custom"),
    // then older series, legacy last.
-    REQUIRE(versions[0].version == "02.08.04");
-    REQUIRE(versions[1].version == "02.08.04.52-dev");
-    REQUIRE(versions[2].version == "02.08.04_custom");
+    REQUIRE(versions[0].version == "02.08.01");
+    REQUIRE(versions[1].version == "02.08.01.52-dev");
+    REQUIRE(versions[2].version == "02.08.01_custom");
    REQUIRE(versions[3].version == "02.03.00");
    REQUIRE(versions.back().version == BAMBU_NETWORK_AGENT_VERSION_LEGACY);

@@ -114,9 +111,9 @@ TEST_CASE_METHOD(PluginFolderFixture, "Managed builds fold into the series; cust
    REQUIRE_FALSE(versions[3].is_latest);

    // Customs sort/render nested under their series (non-empty suffix, base = the series).
-    REQUIRE(versions[1].base_version == "02.08.04");
+    REQUIRE(versions[1].base_version == "02.08.01");
    REQUIRE_FALSE(versions[1].suffix.empty());
-    REQUIRE(versions[2].base_version == "02.08.04");
+    REQUIRE(versions[2].base_version == "02.08.01");
    REQUIRE_FALSE(versions[2].suffix.empty());

    // "(Latest)" is the series row, never a nested custom build.
@@ -126,20 +123,20 @@ TEST_CASE_METHOD(PluginFolderFixture, "Managed builds fold into the series; cust
    REQUIRE_FALSE(versions[2].is_latest);

    // The stored default that drives download and update-check decisions is now the series.
-    REQUIRE(std::string(get_latest_network_version()) == "02.08.04");
+    REQUIRE(std::string(get_latest_network_version()) == "02.08.01");
 }

 TEST_CASE_METHOD(PluginFolderFixture, "Only the loaded series is marked installed", "[NetworkVersions]")
 {
-    add_plugin("02.08.04.60");
-    add_plugin("02.08.04_custom");
+    add_plugin("02.08.01.55");
+    add_plugin("02.08.01_custom");

-    // The loaded plug-in reports its full build (02.08.04.60); the series row is what gets marked.
+    // The loaded plug-in reports its full build (02.08.01.55); the series row is what gets marked.
    {
-        auto versions = get_all_available_versions("02.08.04.60");
+        auto versions = get_all_available_versions("02.08.01.55");
        int marked = 0;
        for (const auto& info : versions)
-            if (info.is_loaded) { ++marked; REQUIRE(info.version == "02.08.04"); }
+            if (info.is_loaded) { ++marked; REQUIRE(info.version == "02.08.01"); }
        REQUIRE(marked == 1);
    }

@@ -155,10 +152,10 @@ TEST_CASE_METHOD(PluginFolderFixture, "Only the loaded series is marked installe

    // A loaded custom build matches its own row, never the bare series.
    {
-        auto versions = get_all_available_versions("02.08.04_custom");
+        auto versions = get_all_available_versions("02.08.01_custom");
        int marked = 0;
        for (const auto& info : versions)
-            if (info.is_loaded) { ++marked; REQUIRE(info.version == "02.08.04_custom"); }
+            if (info.is_loaded) { ++marked; REQUIRE(info.version == "02.08.01_custom"); }
        REQUIRE(marked == 1);
    }

@@ -170,11 +167,11 @@ TEST_CASE_METHOD(PluginFolderFixture, "Only the loaded series is marked installe
 TEST_CASE("Only whitelisted series pass the load gate", "[NetworkVersions]")
 {
    // Each whitelisted series, its builds, and custom-named builds of that series.
-    REQUIRE(is_supported_network_version("02.08.04"));
-    REQUIRE(is_supported_network_version("02.08.04.52"));
-    REQUIRE(is_supported_network_version("02.08.04.60"));
-    REQUIRE(is_supported_network_version("02.08.04_custom"));
-    REQUIRE(is_supported_network_version("02.08.04.52-dev"));
+    REQUIRE(is_supported_network_version("02.08.01"));
+    REQUIRE(is_supported_network_version("02.08.01.52"));
+    REQUIRE(is_supported_network_version("02.08.01.55"));
+    REQUIRE(is_supported_network_version("02.08.01_custom"));
+    REQUIRE(is_supported_network_version("02.08.01.52-dev"));
    REQUIRE(is_supported_network_version("02.03.00"));
    REQUIRE(is_supported_network_version("02.03.00.62"));
    REQUIRE(is_supported_network_version("02.03.00.70"));
@@ -182,9 +179,6 @@ TEST_CASE("Only whitelisted series pass the load gate", "[NetworkVersions]")
    REQUIRE(is_supported_network_version(BAMBU_NETWORK_AGENT_VERSION_LEGACY));

    // Series whitelisted by previous Orca releases that no generation here can call.
-    REQUIRE_FALSE(is_supported_network_version("02.08.01"));
-    REQUIRE_FALSE(is_supported_network_version("02.08.01.55"));
-    REQUIRE_FALSE(is_supported_network_version("02.08.01_custom"));
    REQUIRE_FALSE(is_supported_network_version("02.01.01.52"));
    REQUIRE_FALSE(is_supported_network_version("02.00.02.50"));

@@ -204,9 +198,9 @@ TEST_CASE("Each version resolves to the ABI generation that can call it", "[Netw
 {
    // The generation is keyed on the series, so every build of a series - including the
    // custom-named ones - resolves to the same one.
-    CHECK(network_plugin_abi("02.08.04")        == NetworkAbi::Current);
-    CHECK(network_plugin_abi("02.08.04.60")     == NetworkAbi::Current);
-    CHECK(network_plugin_abi("02.08.04.52-dev") == NetworkAbi::Current);
+    CHECK(network_plugin_abi("02.08.01")        == NetworkAbi::Current);
+    CHECK(network_plugin_abi("02.08.01.55")     == NetworkAbi::Current);
+    CHECK(network_plugin_abi("02.08.01.52-dev") == NetworkAbi::Current);
    CHECK(network_plugin_abi("02.03.00")        == NetworkAbi::V0203);
    CHECK(network_plugin_abi("02.03.00.62")     == NetworkAbi::V0203);
    CHECK(network_plugin_abi("02.03.00_custom") == NetworkAbi::V0203);
@@ -214,7 +208,6 @@ TEST_CASE("Each version resolves to the ABI generation that can call it", "[Netw

    // Anything the load gate rejects must dispatch through nothing at all, rather than
    // defaulting to a layout it does not share.
-    CHECK(network_plugin_abi("02.08.01.55") == NetworkAbi::Unsupported);
    CHECK(network_plugin_abi("02.01.01.52") == NetworkAbi::Unsupported);
    CHECK(network_plugin_abi("02.00.02.50") == NetworkAbi::Unsupported);
    CHECK(network_plugin_abi("02.09.00.10") == NetworkAbi::Unsupported);
@@ -241,7 +234,7 @@ TEST_CASE_METHOD(PluginFolderFixture, "Legacy series never adopts discovered bui
    // With nothing else on disk, the series holds "(Latest)" even though its library is
    // not installed.
    for (const auto& info : versions) {
-        if (info.version == "02.08.04") {
+        if (info.version == "02.08.01") {
            REQUIRE(info.is_latest);
            REQUIRE_FALSE(info.is_loaded);
        }
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M5.5,14.5c-1.105,0-2-3.686-2-7s.895-7,2-7" style="fill:none;stroke:#009688;stroke-linecap:round;stroke-linejoin:round"/><line x1="8.67" y1="4.67" x2="14.33" y2="10.33" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round"/><line x1="14.33" y1="4.67" x2="8.67" y2="10.33" style="fill:none;stroke:#949494;stroke-linecap:square;stroke-linejoin:round"/><path d="M3.5,13.7c-.294.511-.636.8-1,.8-1.1,0-2-3.686-2-7s.9-7,2-7c.365,0,.707.293,1,.805" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M6.727,4.5c.334-2.208,1-4,1.773-4,.354,0,.686.378.974,1" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M9.474,13.5c-.288.622-.62,1-.974,1-.77,0-1.439-1.792-1.773-4" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/></svg>