Fix manual tool change handling when loading G-code files (#15379)

Opened or drag-dropped G-code files ignored `; MANUAL_TOOL_CHANGE` comments, so the preview showed every move on the first filament. Only `apply_config(const PrintConfig&)` read `manual_filament_change`, and loading a file goes through `apply_config(const DynamicPrintConfig&)`. Read the option there too, initialize the flag to false, and add a regression test.

.github/workflows/build_orca.yml

@@ -341,12 +341,12 @@ jobs:
           
           # Notarize main DMG
           xcrun notarytool submit "OrcaSlicer_Mac_universal_${{ env.ver }}.dmg" --apple-id "${{ secrets.APPLE_DEV_ACCOUNT }}" --team-id "${{ secrets.TEAM_ID }}" --password "${{ secrets.APP_PWD }}" --wait
-          xcrun stapler staple OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
+          retry xcrun stapler staple OrcaSlicer_Mac_universal_${{ env.ver }}.dmg
 
           # Notarize profile validator DMG if it exists
           if [ -f "OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg" ]; then
             xcrun notarytool submit "OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg" --apple-id "${{ secrets.APPLE_DEV_ACCOUNT }}" --team-id "${{ secrets.TEAM_ID }}" --password "${{ secrets.APP_PWD }}" --wait
-            xcrun stapler staple OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
+            retry xcrun stapler staple OrcaSlicer_profile_validator_Mac_universal_${{ env.ver }}.dmg
           fi
 
       - name: Create DMG without notary
@@ -460,10 +460,6 @@ jobs:
       - name: Build slicer Win
         if: runner.os == 'Windows'
         working-directory: ${{ github.workspace }}
-        # Orca: Removed Netfabb STL fixing service support in favor of CGAL.
-        # env:
-        #   WindowsSdkDir: 'C:\Program Files (x86)\Windows Kits\10\'
-        #   WindowsSDKVersion: '10.0.26100.0\'
         # --tests builds the unit tests too; the unit_tests_windows_* jobs run them.
         run: |
           # cache-path is the install directory inside the deps build directory.

.github/workflows/clang_tidy.yml

@@ -16,6 +16,15 @@ on:
 
 permissions:
   contents: read
+  # Listing caches and builds while waiting for a deps cache.
+  actions: read
+
+# Read by scripts/ci_deps_cache.sh.
+env:
+  REPO: ${{ github.repository }}
+  WORKFLOW: build_all.yml
+  BASE_REF: ${{ github.base_ref }}
+  JOB: build_linux (${{ vars.SELF_HOSTED && 'orca-lnx-server' || 'ubuntu-24.04' }})
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
@@ -35,7 +44,7 @@ jobs:
           # The PR merge commit plus its first parent, the base it is diffed against.
           fetch-depth: 2
 
-      - name: Look for changed C++ files
+      - name: Look for changed files
         id: changes
         run: |
           if git -c core.quotePath=false diff --name-only HEAD^1 -- src tests | grep -qE '\.(cpp|cc|cxx|hpp|h|hxx)$'; then
@@ -43,18 +52,75 @@ jobs:
           else
             echo "No C++ changes under src/ or tests/."
           fi
+          if ! git diff --quiet HEAD^1 -- deps; then
+            echo "deps=true" >> "$GITHUB_OUTPUT"
+          fi
+          echo "deps-key=linux-clang-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }}" >> "$GITHUB_OUTPUT"
 
-      # Parsing needs the dependency headers, not a build of this PR's deps/, so
-      # a PR that changes deps/ falls back to the newest cache main has.
+      # Parsing needs the dependency headers, not a build of this PR's deps/.
+      # Without an exact match the job waits for the build that saves it: this
+      # PR's own when it changes deps/, otherwise a running push build of the
+      # base branch with the same deps. With neither, a PR that keeps deps/
+      # falls back to the newest cache.
       - name: Restore cached deps
+        id: deps_cache
         if: steps.changes.outputs.cpp == 'true'
         uses: actions/cache/restore@v6
         with:
           path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
-          key: linux-clang-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }}
+          key: ${{ steps.changes.outputs.deps-key }}
+
+      - name: Look for a build to wait for
+        id: wait_check
+        if: steps.changes.outputs.cpp == 'true' && steps.deps_cache.outputs.cache-hit != 'true'
+        env:
+          GH_TOKEN: ${{ github.token }}
+          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+        run: bash scripts/ci_deps_cache.sh ${{ steps.changes.outputs.deps == 'true' && 'own' || 'check' }}
+
+      # Linux Build Deps takes about 35 minutes on GitHub-hosted runners. The
+      # wait ends early when the deps job fails.
+      - name: Wait for the deps cache
+        if: steps.wait_check.outputs.wait-for != ''
+        timeout-minutes: 100
+        env:
+          GH_TOKEN: ${{ github.token }}
+          KEY: ${{ steps.changes.outputs.deps-key }}
+          CACHE_REF: ${{ steps.changes.outputs.deps == 'true' && github.ref || format('refs/heads/{0}', github.base_ref) }}
+          KEY_INPUTS: ${{ steps.wait_check.outputs.key-inputs }}
+          WAIT_FOR: ${{ steps.wait_check.outputs.wait-for }}
+          WAIT_SINCE: ${{ steps.wait_check.outputs.wait-since }}
+          WAIT_MINUTES: 90
+        run: bash scripts/ci_deps_cache.sh wait
+
+      - name: Restore the deps cache after waiting
+        id: waited_cache
+        if: steps.wait_check.outputs.wait-for != ''
+        uses: actions/cache/restore@v6
+        with:
+          path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
+          key: ${{ steps.changes.outputs.deps-key }}
+
+      - name: Fail without this PR's deps cache
+        if: steps.changes.outputs.deps == 'true' && steps.wait_check.outcome == 'success' && steps.waited_cache.outputs.cache-hit != 'true'
+        run: |
+          echo "::error::No deps cache ${{ steps.changes.outputs.deps-key }}. Check this PR's Linux Build Deps job, then rerun clang-tidy."
+          exit 1
+
+      - name: Restore the newest cached deps
+        id: newest_cache
+        if: steps.changes.outputs.deps != 'true' && steps.wait_check.outcome == 'success' && steps.waited_cache.outputs.cache-hit != 'true'
+        uses: actions/cache/restore@v6
+        with:
+          path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
+          key: ${{ steps.changes.outputs.deps-key }}
           restore-keys: linux-clang-cache-orcaslicer_deps-build-
           fail-on-cache-miss: true
 
+      - name: Warn about older deps
+        if: steps.newest_cache.outcome == 'success' && steps.newest_cache.outputs.cache-hit != 'true'
+        run: echo "::warning title=Older deps::No cache matches this PR's deps/, so clang-tidy parsed against ${{ steps.newest_cache.outputs.cache-matched-key }}. If it reports errors in code that uses a dependency, rerun clang-tidy once the base branch's Build all has saved the new deps."
+
       - name: Apt-Install Dependencies
         if: steps.changes.outputs.cpp == 'true' && !vars.SELF_HOSTED
         uses: ./.github/actions/apt-install-deps

CMakeLists.txt

@@ -497,47 +497,6 @@ endif()
 # Once we get rid of Perl and libslic3r is linked statically, we can get rid of -fPIC
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-# WIN10SDK_PATH is used to point CMake to the WIN10 SDK installation directory.
-# We pick it from environment if it is not defined in another way
-# ORCA: Removed Netfabb STL fixing service support in favor of CGAL.
-# if(WIN32)
-#     if(NOT DEFINED WIN10SDK_PATH)
-#         if(DEFINED ENV{WIN10SDK_PATH})
-#                 set(WIN10SDK_PATH "$ENV{WIN10SDK_PATH}")
-#         endif()
-#     endif()
-#     if(DEFINED WIN10SDK_PATH)
-#         #BBS: modify win10sdk_path
-#         if (EXISTS "${WIN10SDK_PATH}/winrt/windows.graphics.printing3d.h")
-#             set(WIN10SDK_INCLUDE_PATH "${WIN10SDK_PATH}")
-#         else()
-#             message("WIN10SDK_PATH is invalid: ${WIN10SDK_PATH}")
-#             message("${WIN10SDK_PATH}/winrt/windows.graphics.printing3d.h was not found")
-#             message("STL fixing by the Netfabb service will not be compiled")
-#             unset(WIN10SDK_PATH)
-#         endif()
-#     else()
-#         # Try to use the default Windows 10 SDK path.
-#         if (DEFINED ENV{WindowsSdkDir} AND DEFINED ENV{WindowsSDKVersion})
-#             set(WIN10SDK_INCLUDE_PATH "$ENV{WindowsSdkDir}/Include/$ENV{WindowsSDKVersion}")
-#         else ()
-#             set(WIN10SDK_INCLUDE_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0")
-#         endif ()
-#         if (NOT EXISTS "${WIN10SDK_INCLUDE_PATH}/winrt/windows.graphics.printing3d.h")
-#             message("${WIN10SDK_INCLUDE_PATH}/winrt/windows.graphics.printing3d.h was not found")
-#             message("STL fixing by the Netfabb service will not be compiled")
-#             unset(WIN10SDK_INCLUDE_PATH)
-#         endif()
-#     endif()
-#     if(WIN10SDK_INCLUDE_PATH)
-#         message("Building with Win10 Netfabb STL fixing service support")
-#         add_definitions(-DHAS_WIN10SDK)
-#         include_directories(SYSTEM "${WIN10SDK_INCLUDE_PATH}")
-#     else()
-#         message("Building without Win10 Netfabb STL fixing service support")
-#     endif()
-# endif()
-
 if (APPLE)
     message("OS X SDK Path: ${CMAKE_OSX_SYSROOT}")
     if (CMAKE_OSX_DEPLOYMENT_TARGET)

docs/HLSD/mesh-repair.md

@@ -0,0 +1,135 @@
+# Mesh repair — High Level Design
+
+## Purpose and scope
+
+Mesh repair turns a broken triangle mesh into closed, outward oriented shells that bound a solid, so that the
+mesh slices predictably and the other mesh tools (booleans, cut, painting) get valid input. It runs on demand:
+the *Fix Model* command of the context menu of an object or part and of the warning icon in the object list, *Fix
+All* and *Fix All Plates* in the context menu of a plate, the prompt the Cut tool shows when a cut leaves open edges,
+the *Repair and import* choice of texture import, and the `--repair` option of the command line. It is built on CGAL
+and is the only repair the application has, on every platform.
+
+`repair_mesh()` in `src/libslic3r/MeshRepair.cpp` does the work on one `TriangleMesh`, and `ModelVolume::repair()`
+applies it to a part: it replaces the mesh only when the repair changed it, and remaps or drops the painting of a
+replaced mesh. The GUI side, `fix_model_with_cgal_gui()` in `src/slic3r/Utils/FixModelByCgal.cpp`, runs it on a
+worker thread for each volume of an object, or for one volume, behind a progress dialog. `repair_mesh()` reports its
+progress between stages through a callback, which cancels the repair by throwing.
+
+## What the repaired mesh is
+
+The repair keeps what the slicer would print from the input. The slicer fills a layer where the winding number of
+the input surface is not zero (`MeshSlicingParams::SlicingMode::Regular` uses Clipper's nonzero fill rule), so:
+
+- Shells crossing each other print as their union. The repair keeps them as separate shells, as the parts of an
+  object are kept, and makes each of them an outward oriented solid.
+- A shell inside a solid that is oriented like it adds nothing, and the repair removes it.
+- A shell inside a solid that is oriented inward is a cavity, and stays one.
+- A whole mesh turned inside out prints as a solid, and the repair turns it outward.
+
+On top of that, it closes holes and cracks, gives inconsistently oriented triangles the orientation of their
+neighbours, drops degenerate, duplicate and stray flat geometry, and removes small self-intersections inside a shell,
+such as slivers and folds. Where none of this applies, it reports the mesh as unmodified and the caller keeps the
+original mesh, its painting and its object id.
+
+A volume is repaired in place and is never split into several parts: splitting by connectivity would turn a cavity
+into a separate solid part and fill it. Each solid of the result is a shell of its own, so *Split to parts* still
+separates them. Open pieces of the input whose borders meet exactly, which are pieces of one surface rather than
+solids, come out as the one shell they form.
+
+## Pipeline
+
+The input is treated as a triangle soup. Every stage after the first only runs on what the previous ones could
+not settle, so a valid mesh passes through quickly.
+
+### Valid parts first
+
+Parts of the input that are connected by vertex indices and are already closed, consistently oriented 2-manifolds
+skip the soup stages and go straight to the shell stages. Merging their points with coincident points of other
+parts would only make non-manifold junctions out of solids that touch, for example parts of an assembly exported
+together or voxels written as separate cubes.
+
+### Soup clean-up
+
+The rest of the soup has its coincident points merged. Triangles with repeated corners are dropped. Coincident
+triangles of opposite orientation are a wall between two solids touching face to face, so they cancel in pairs;
+of the remaining copies of a triangle one is kept. A connected region that would vanish entirely through
+cancelling is a two-sided export instead (every face written in both orientations), and keeps one copy of each
+triangle.
+
+Open edges then get their vertices welded within a tolerance of 1e-4 of the bounding box diagonal, which closes the
+cracks some exporters leave between triangles that should share corners. A vertex is never welded further than a
+quarter of its shortest edge, so welding cannot collapse fine detail. A soup that stays mostly open after welding has
+cracks wider than that tolerance, and is welded again with ten and then a hundred times the tolerance.
+
+### Work units
+
+The soup is cut into units repaired independently and in parallel: its connected parts, except that open parts whose
+bounding boxes touch share a unit, so that cracks and T-junctions between separately exported patches still close.
+
+### Building the mesh
+
+A unit whose edges are each shared by at most two triangles, running in opposite directions, and whose vertices each
+have a single fan of triangles, becomes a `Surface_mesh` directly. Any other unit is oriented first. Triangles are
+flipped so that neighbours across an edge shared by two of them agree, each part keeping the orientation the
+majority of its area had, which keeps inward oriented cavities inward. Edges where that is impossible or that more
+than two triangles share are cut, and each fan of triangles around a vertex gets its own copy of the vertex. If that
+still leaves an invalid mesh, CGAL's `orient_polygon_soup()` orients the unit instead, and the parts it flipped
+against their majority are reversed back. The linear pass exists because `orient_polygon_soup()` is several times
+slower on large soups that need only a few fixes.
+
+### Closing
+
+Compatible borders are stitched, parts that can be stitched once reversed are merged, and borders still open are
+snapped onto each other within the weld tolerance, which closes T-junctions. Exactly degenerate faces are removed.
+
+Holes are filled last. Planar border loops that face each other in one plane, one inside the other, bound a single
+region, such as a missing annulus at the end of a tube or a cap with features standing on it. Such a group is
+triangulated at once with a 2D constrained Delaunay triangulation that fills only the faces at odd nesting depth,
+so the openings inside the region stay open. The patch is used only if it closes every loop with the orientation
+of the triangles around it. Every other loop is filled on its own with `triangulate_hole()`, which uses a 2D
+constrained Delaunay triangulation when the loop is planar. Otherwise it searches the best triangulation among all
+triangles over the loop for loops of up to 100 edges, and among the triangles of a 3D Delaunay triangulation for
+longer ones, as the full search is cubic in the length of the loop. Beyond 200 edges the full search is not even
+used as a fallback, and a fan around the loop's centroid closes a loop nothing else could.
+
+The closed unit is split into its shells. The largest stays in place and the others are copied out, as converting
+the whole mesh again costs seconds on large models.
+
+### Shells
+
+The shells of all units, together with the valid parts set aside at the start, are handled independently and in
+parallel. Shells enclosing no volume, which hole filling makes out of stray flat patches, are dropped.
+
+Self-intersections inside a shell are removed locally with `experimental::remove_self_intersections()`, which
+remeshes the region around them. It is used only for local defects: a shell whose intersections involve more than
+5 % of its faces is left as it is, and a result that changes the enclosed volume by more than 0.1 % is undone. On
+heavily overlapping ornamental models the remeshing otherwise cuts parts down to slivers, while on genuine defects
+it changes the volume by thousandths of a percent. Overlaps left in place slice correctly. Remeshing can cut
+small pieces off a shell, so a shell it changed is split again and its pieces enclosing no volume are dropped.
+
+Shells crossing others are found through their bounding boxes and an AABB tree per shell, and are made outward
+oriented solids. For every other shell the winding number just outside it is summed from the orientation of the
+shells containing it, tested from a point on its largest face. The shell bounds the solid only if the winding
+number is zero on exactly one of its sides; it is then oriented so that the solid is inside, or dropped otherwise.
+
+Crossing shells are not united. Slicing unites them anyway, uniting them exactly costs tens of seconds on models
+made of many overlapping pieces, and it would fuse parts that *Split to parts* should keep apart.
+
+## Robustness
+
+The repair avoids `experimental::autorefine_and_remove_self_intersections()` and corefinement, which can crash on
+messy input, and uses only steps whose failures it can detect. A step that fails keeps its input. CGAL precondition
+failures surface as `repair_mesh()` returning false with the message as the error. The output is written in float,
+as every mesh in the application is.
+
+The result does not depend on thread scheduling. `libslic3r_cgal` is built with `CGAL_LINKED_WITH_TBB`. Units and
+shells are processed in parallel, but each on its own data, and their results are gathered in a fixed order;
+sorts compare complete keys, and the detected self-intersections are put in order before they are used. Snapping
+stays sequential, as its parallel version gives different results from run to run. Holes are filled with the full
+search wherever it is affordable, because the search among Delaunay triangles can choose between equally good fills
+differently from run to run, so only non-planar holes of more than 100 edges may still vary. On some inputs
+`experimental::remove_self_intersections()` itself places a few vertices differently from run to run.
+
+## Verification
+
+`tests/libslic3r/test_mesh_repair.cpp` covers each kind of defect above on small meshes with known volumes.

localization/i18n/list.txt

@@ -309,7 +309,6 @@ src/slic3r/GUI/BBLStatusBarPrint.cpp
 src/slic3r/GUI/BBLStatusBarSend.cpp
 src/slic3r/GUI/BaseTransparentDPIFrame.cpp
 src/slic3r/GUI/CloneDialog.cpp
-src/slic3r/GUI/LegacyPrinterMigrationDialog.cpp
 src/slic3r/GUI/ColorDecomposeDialog.cpp
 src/slic3r/GUI/ColorDecomposeSupport.cpp
 src/slic3r/GUI/ConfigWizard.cpp

resources/info/legacy_compatible_printers.json

@@ -1,795 +0,0 @@
-{
-    "presets": {
-        "Bambu ABS @BBL P1P": [
-            "Bambu Lab P1P 0.6 nozzle"
-        ],
-        "Bambu ABS @BBL X1C": [
-            "Bambu Lab P1S 0.4 nozzle",
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle"
-        ],
-        "Bambu ASA @BBL X2D": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Bambu PA6-CF @BBL H2D": [
-            "Bambu Lab H2D 0.6 nozzle",
-            "Bambu Lab H2D 0.8 nozzle"
-        ],
-        "Bambu PA6-CF @BBL H2DP": [
-            "Bambu Lab H2D Pro 0.6 nozzle",
-            "Bambu Lab H2D Pro 0.8 nozzle"
-        ],
-        "Bambu PA6-CF @BBL H2S": [
-            "Bambu Lab H2S 0.6 nozzle",
-            "Bambu Lab H2S 0.8 nozzle"
-        ],
-        "Bambu PA6-CF @BBL P2S": [
-            "Bambu Lab P2S 0.6 nozzle",
-            "Bambu Lab P2S 0.8 nozzle"
-        ],
-        "Bambu PA6-CF @BBL X1C": [
-            "Bambu Lab P1P 0.6 nozzle",
-            "Bambu Lab P1P 0.8 nozzle",
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab P1S 0.8 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.8 nozzle"
-        ],
-        "Bambu PA6-CF @BBL X2D": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Bambu PAHT-CF @BBL H2D": [
-            "Bambu Lab H2D 0.6 nozzle",
-            "Bambu Lab H2D 0.8 nozzle"
-        ],
-        "Bambu PAHT-CF @BBL H2DP": [
-            "Bambu Lab H2D Pro 0.6 nozzle",
-            "Bambu Lab H2D Pro 0.8 nozzle"
-        ],
-        "Bambu PAHT-CF @BBL H2S": [
-            "Bambu Lab H2S 0.6 nozzle",
-            "Bambu Lab H2S 0.8 nozzle"
-        ],
-        "Bambu PAHT-CF @BBL P1P": [
-            "Bambu Lab P1P 0.6 nozzle",
-            "Bambu Lab P1P 0.8 nozzle"
-        ],
-        "Bambu PAHT-CF @BBL P2S": [
-            "Bambu Lab P2S 0.6 nozzle",
-            "Bambu Lab P2S 0.8 nozzle"
-        ],
-        "Bambu PAHT-CF @BBL X1C": [
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab P1S 0.8 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.8 nozzle"
-        ],
-        "Bambu PAHT-CF @BBL X2D": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Bambu PC @BBL P1P": [
-            "Bambu Lab P1P 0.6 nozzle"
-        ],
-        "Bambu PETG @0.2 nozzle": [
-            "Qidi Q1 Pro 0.2 nozzle"
-        ],
-        "Bambu PETG Basic @BBL H2D 0.6 nozzle": [
-            "Bambu Lab H2D 0.8 nozzle"
-        ],
-        "Bambu PETG Basic @BBL H2DP 0.6 nozzle": [
-            "Bambu Lab H2D Pro 0.8 nozzle"
-        ],
-        "Bambu PETG Basic @BBL H2S": [
-            "Bambu Lab H2S 0.6 nozzle",
-            "Bambu Lab H2S 0.8 nozzle"
-        ],
-        "Bambu PETG Basic @BBL P2S 0.6 nozzle": [
-            "Bambu Lab P2S 0.8 nozzle"
-        ],
-        "Bambu PETG Basic @BBL X2D": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Bambu PETG HF @BBL P2S 0.6 nozzle": [
-            "Bambu Lab P2S 0.8 nozzle"
-        ],
-        "Bambu PETG HF @BBL X1C": [
-            "Bambu Lab P1P 0.4 nozzle",
-            "Bambu Lab P1S 0.4 nozzle"
-        ],
-        "Bambu PETG HF @BBL X1C 0.8 nozzle": [
-            "Bambu Lab X1 Carbon 0.6 nozzle"
-        ],
-        "Bambu PETG HF @BBL X2D": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Bambu PETG Translucent @BBL H2D 0.6 nozzle": [
-            "Bambu Lab H2D 0.8 nozzle"
-        ],
-        "Bambu PETG Translucent @BBL H2DP 0.6 nozzle": [
-            "Bambu Lab H2D Pro 0.8 nozzle"
-        ],
-        "Bambu PETG Translucent @BBL H2S": [
-            "Bambu Lab H2S 0.6 nozzle",
-            "Bambu Lab H2S 0.8 nozzle"
-        ],
-        "Bambu PETG Translucent @BBL P2S 0.6 nozzle": [
-            "Bambu Lab P2S 0.8 nozzle"
-        ],
-        "Bambu PETG Translucent @BBL X1C 0.8 nozzle": [
-            "Bambu Lab P1P 0.6 nozzle",
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle"
-        ],
-        "Bambu PETG-CF @BBL H2D 0.6 nozzle": [
-            "Bambu Lab H2D 0.8 nozzle"
-        ],
-        "Bambu PETG-CF @BBL H2DP 0.6 nozzle": [
-            "Bambu Lab H2D Pro 0.8 nozzle"
-        ],
-        "Bambu PETG-CF @BBL H2S": [
-            "Bambu Lab H2S 0.6 nozzle",
-            "Bambu Lab H2S 0.8 nozzle"
-        ],
-        "Bambu PETG-CF @BBL P2S 0.6 nozzle": [
-            "Bambu Lab P2S 0.8 nozzle"
-        ],
-        "Bambu PLA Basic @BBL P1P": [
-            "Bambu Lab P1P 0.6 nozzle"
-        ],
-        "Bambu PLA Basic @BBL X1C": [
-            "Bambu Lab P1S 0.4 nozzle",
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle"
-        ],
-        "Bambu PLA Basic @BBL X2D 0.6 nozzle": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Bambu PLA Dynamic @BBL P1P": [
-            "Bambu Lab P1P 0.6 nozzle"
-        ],
-        "Bambu PLA Dynamic @BBL X1C": [
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle"
-        ],
-        "Bambu PLA Galaxy @BBL P1P": [
-            "Bambu Lab P1P 0.6 nozzle"
-        ],
-        "Bambu PLA Galaxy @BBL X1C": [
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle"
-        ],
-        "Bambu PLA Glow @BBL P1P": [
-            "Bambu Lab P1P 0.6 nozzle"
-        ],
-        "Bambu PLA Glow @BBL X1C": [
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle"
-        ],
-        "Bambu PLA Lite @BBL H2D": [
-            "Bambu Lab H2D 0.6 nozzle"
-        ],
-        "Bambu PLA Lite @BBL H2S": [
-            "Bambu Lab H2S 0.6 nozzle",
-            "Bambu Lab H2S 0.8 nozzle"
-        ],
-        "Bambu PLA Lite @BBL P1P": [
-            "Bambu Lab P1P 0.6 nozzle"
-        ],
-        "Bambu PLA Lite @BBL X1C": [
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle"
-        ],
-        "Bambu PLA Lite @BBL X2D": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Bambu PLA Marble @BBL P1P": [
-            "Bambu Lab P1P 0.6 nozzle",
-            "Bambu Lab P1P 0.8 nozzle"
-        ],
-        "Bambu PLA Marble @BBL X1C": [
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle"
-        ],
-        "Bambu PLA Matte @BBL P1P": [
-            "Bambu Lab P1P 0.6 nozzle"
-        ],
-        "Bambu PLA Matte @BBL X1C": [
-            "Bambu Lab P1S 0.4 nozzle",
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle"
-        ],
-        "Bambu PLA Matte @BBL X2D": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Bambu PLA Metal @BBL P1P": [
-            "Bambu Lab P1P 0.6 nozzle"
-        ],
-        "Bambu PLA Metal @BBL X1C": [
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle"
-        ],
-        "Bambu PLA Silk+ @BBL H2D": [
-            "Bambu Lab H2D 0.6 nozzle",
-            "Bambu Lab H2D 0.8 nozzle"
-        ],
-        "Bambu PLA Silk+ @BBL H2DP": [
-            "Bambu Lab H2D Pro 0.6 nozzle",
-            "Bambu Lab H2D Pro 0.8 nozzle"
-        ],
-        "Bambu PLA Silk+ @BBL H2S": [
-            "Bambu Lab H2S 0.6 nozzle",
-            "Bambu Lab H2S 0.8 nozzle"
-        ],
-        "Bambu PLA Silk+ @BBL P1P": [
-            "Bambu Lab P1P 0.6 nozzle"
-        ],
-        "Bambu PLA Silk+ @BBL X1C": [
-            "Bambu Lab P1S 0.4 nozzle",
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle"
-        ],
-        "Bambu PLA Silk+ @BBL X2D": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Bambu PLA Sparkle @BBL P1P": [
-            "Bambu Lab P1P 0.6 nozzle"
-        ],
-        "Bambu PLA Sparkle @BBL X1C": [
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle"
-        ],
-        "Bambu PLA Tough+ @BBL P1P": [
-            "Bambu Lab P1P 0.6 nozzle"
-        ],
-        "Bambu PLA Tough+ @BBL X1C": [
-            "Bambu Lab X1 Carbon 0.6 nozzle"
-        ],
-        "Bambu PLA Tough+ @BBL X2D": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Bambu PLA Translucent @BBL H2D 0.8 nozzle": [
-            "Bambu Lab H2D 0.6 nozzle"
-        ],
-        "Bambu PLA Translucent @BBL H2DP 0.8 nozzle": [
-            "Bambu Lab H2D Pro 0.6 nozzle"
-        ],
-        "Bambu PLA Translucent @BBL H2S": [
-            "Bambu Lab H2S 0.6 nozzle",
-            "Bambu Lab H2S 0.8 nozzle"
-        ],
-        "Bambu PLA Wood @BBL P1P": [
-            "Bambu Lab P1P 0.6 nozzle"
-        ],
-        "Bambu PLA Wood @BBL X1C": [
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle"
-        ],
-        "Bambu PLA-CF @BBL H2D 0.6 nozzle": [
-            "Bambu Lab H2D 0.8 nozzle"
-        ],
-        "Bambu PLA-CF @BBL H2DP 0.6 nozzle": [
-            "Bambu Lab H2D Pro 0.8 nozzle"
-        ],
-        "Bambu PLA-CF @BBL H2S": [
-            "Bambu Lab H2S 0.6 nozzle",
-            "Bambu Lab H2S 0.8 nozzle"
-        ],
-        "Bambu PLA-CF @BBL P2S 0.6 nozzle": [
-            "Bambu Lab P2S 0.8 nozzle"
-        ],
-        "Bambu PLA-CF @BBL X2D": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Bambu PPA-CF @BBL X1C": [
-            "Bambu Lab P1P 0.6 nozzle",
-            "Bambu Lab P1P 0.8 nozzle",
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab P1S 0.8 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.8 nozzle"
-        ],
-        "Bambu PVA @BBL H2D": [
-            "Bambu Lab H2D 0.6 nozzle",
-            "Bambu Lab H2D 0.8 nozzle"
-        ],
-        "Bambu PVA @BBL H2DP": [
-            "Bambu Lab H2D Pro 0.6 nozzle",
-            "Bambu Lab H2D Pro 0.8 nozzle"
-        ],
-        "Bambu PVA @BBL H2S": [
-            "Bambu Lab H2S 0.6 nozzle",
-            "Bambu Lab H2S 0.8 nozzle"
-        ],
-        "Bambu PVA @BBL P2S": [
-            "Bambu Lab P2S 0.6 nozzle",
-            "Bambu Lab P2S 0.8 nozzle"
-        ],
-        "Bambu PVA @BBL X2D": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Bambu Support For PLA @BBL H2D": [
-            "Bambu Lab H2D 0.6 nozzle",
-            "Bambu Lab H2D 0.8 nozzle"
-        ],
-        "Bambu Support For PLA @BBL H2DP": [
-            "Bambu Lab H2D Pro 0.6 nozzle",
-            "Bambu Lab H2D Pro 0.8 nozzle"
-        ],
-        "Bambu Support For PLA @BBL H2S": [
-            "Bambu Lab H2S 0.6 nozzle",
-            "Bambu Lab H2S 0.8 nozzle"
-        ],
-        "Bambu Support For PLA @BBL P2S": [
-            "Bambu Lab P2S 0.6 nozzle",
-            "Bambu Lab P2S 0.8 nozzle"
-        ],
-        "Bambu Support For PLA @BBL X2D": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Bambu Support For PLA/PETG @BBL H2D": [
-            "Bambu Lab H2D 0.6 nozzle",
-            "Bambu Lab H2D 0.8 nozzle"
-        ],
-        "Bambu Support For PLA/PETG @BBL H2DP": [
-            "Bambu Lab H2D Pro 0.6 nozzle",
-            "Bambu Lab H2D Pro 0.8 nozzle"
-        ],
-        "Bambu Support For PLA/PETG @BBL H2S": [
-            "Bambu Lab H2S 0.6 nozzle",
-            "Bambu Lab H2S 0.8 nozzle"
-        ],
-        "Bambu Support For PLA/PETG @BBL P2S": [
-            "Bambu Lab P2S 0.6 nozzle",
-            "Bambu Lab P2S 0.8 nozzle"
-        ],
-        "Bambu Support For PLA/PETG @BBL X2D": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Bambu Support for ABS @BBL H2D": [
-            "Bambu Lab H2D 0.6 nozzle",
-            "Bambu Lab H2D 0.8 nozzle"
-        ],
-        "Bambu Support for ABS @BBL H2DP": [
-            "Bambu Lab H2D Pro 0.6 nozzle",
-            "Bambu Lab H2D Pro 0.8 nozzle"
-        ],
-        "Bambu Support for ABS @BBL H2S": [
-            "Bambu Lab H2S 0.6 nozzle",
-            "Bambu Lab H2S 0.8 nozzle"
-        ],
-        "Bambu Support for ABS @BBL P2S": [
-            "Bambu Lab P2S 0.6 nozzle",
-            "Bambu Lab P2S 0.8 nozzle"
-        ],
-        "Bambu Support for ABS @BBL X2D": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Bambu TPU 90A @BBL H2D": [
-            "Bambu Lab H2D 0.6 nozzle",
-            "Bambu Lab H2D 0.8 nozzle"
-        ],
-        "Bambu TPU 90A @BBL H2DP": [
-            "Bambu Lab H2D Pro 0.6 nozzle",
-            "Bambu Lab H2D Pro 0.8 nozzle"
-        ],
-        "Bambu TPU 95A HF @BBL H2D": [
-            "Bambu Lab H2D 0.4 nozzle",
-            "Bambu Lab H2D 0.8 nozzle"
-        ],
-        "Bambu TPU 95A HF @BBL H2DP": [
-            "Bambu Lab H2D Pro 0.4 nozzle",
-            "Bambu Lab H2D Pro 0.8 nozzle"
-        ],
-        "Bambu TPU 95A HF @BBL H2S": [
-            "Bambu Lab H2S 0.6 nozzle",
-            "Bambu Lab H2S 0.8 nozzle"
-        ],
-        "Bambu TPU 95A HF @BBL P2S": [
-            "Bambu Lab P2S 0.6 nozzle",
-            "Bambu Lab P2S 0.8 nozzle"
-        ],
-        "Bambu TPU 95A HF @BBL X2D": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Bambu TPU for AMS @BBL H2D": [
-            "Bambu Lab H2D 0.6 nozzle",
-            "Bambu Lab H2D 0.8 nozzle"
-        ],
-        "Bambu TPU for AMS @BBL H2DP": [
-            "Bambu Lab H2D Pro 0.6 nozzle",
-            "Bambu Lab H2D Pro 0.8 nozzle"
-        ],
-        "Bambu TPU for AMS @BBL H2S": [
-            "Bambu Lab H2S 0.6 nozzle",
-            "Bambu Lab H2S 0.8 nozzle"
-        ],
-        "Bambu TPU for AMS @BBL P1P": [
-            "Bambu Lab P1P 0.6 nozzle"
-        ],
-        "Bambu TPU for AMS @BBL P2S": [
-            "Bambu Lab P2S 0.6 nozzle",
-            "Bambu Lab P2S 0.8 nozzle"
-        ],
-        "Bambu TPU for AMS @BBL X1C": [
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab X1 Carbon 0.6 nozzle"
-        ],
-        "Bambu TPU for AMS @BBL X2D": [
-            "Bambu Lab X2D 0.8 nozzle"
-        ],
-        "Blocks ABS @Blocks_RD50_V2": [
-            "BLOCKS RF50 0.4 nozzle",
-            "BLOCKS RF50 0.6 nozzle",
-            "BLOCKS RF50 0.8 nozzle"
-        ],
-        "Blocks ASA @Blocks_RD50_V2": [
-            "BLOCKS RF50 0.4 nozzle",
-            "BLOCKS RF50 0.6 nozzle",
-            "BLOCKS RF50 0.8 nozzle"
-        ],
-        "Blocks ASA-CF @Blocks_RD50_V2": [
-            "BLOCKS RF50 0.4 nozzle",
-            "BLOCKS RF50 0.6 nozzle",
-            "BLOCKS RF50 0.8 nozzle"
-        ],
-        "Blocks PA @Blocks_RD50_V2": [
-            "BLOCKS RF50 0.4 nozzle",
-            "BLOCKS RF50 0.6 nozzle",
-            "BLOCKS RF50 0.8 nozzle"
-        ],
-        "Blocks PA-CF @Blocks_RD50_V2": [
-            "BLOCKS RF50 0.4 nozzle",
-            "BLOCKS RF50 0.6 nozzle",
-            "BLOCKS RF50 0.8 nozzle"
-        ],
-        "Blocks PC @Blocks_RD50_V2": [
-            "BLOCKS RF50 0.4 nozzle",
-            "BLOCKS RF50 0.6 nozzle",
-            "BLOCKS RF50 0.8 nozzle"
-        ],
-        "Blocks PETG @Blocks_Pro_S100": [
-            "BLOCKS RD50 V2 0.4 nozzle",
-            "BLOCKS RD50 V2 0.6 nozzle",
-            "BLOCKS RD50 V2 0.8 nozzle",
-            "BLOCKS RF50 0.4 nozzle",
-            "BLOCKS RF50 0.6 nozzle",
-            "BLOCKS RF50 0.8 nozzle"
-        ],
-        "Blocks PLA @Blocks_Pro_S100": [
-            "BLOCKS RD50 V2 0.4 nozzle",
-            "BLOCKS RD50 V2 0.6 nozzle",
-            "BLOCKS RD50 V2 0.8 nozzle",
-            "BLOCKS RF50 0.4 nozzle",
-            "BLOCKS RF50 0.6 nozzle",
-            "BLOCKS RF50 0.8 nozzle"
-        ],
-        "Blocks PLA-CF @Blocks_RD50_V2": [
-            "BLOCKS RF50 0.4 nozzle",
-            "BLOCKS RF50 0.6 nozzle",
-            "BLOCKS RF50 0.8 nozzle"
-        ],
-        "Blocks PVA @Blocks_RD50_V2": [
-            "BLOCKS RF50 0.4 nozzle",
-            "BLOCKS RF50 0.6 nozzle",
-            "BLOCKS RF50 0.8 nozzle"
-        ],
-        "Blocks TPU @Blocks_Pro_S100": [
-            "BLOCKS RD50 V2 0.4 nozzle",
-            "BLOCKS RD50 V2 0.6 nozzle",
-            "BLOCKS RD50 V2 0.8 nozzle",
-            "BLOCKS RF50 0.4 nozzle",
-            "BLOCKS RF50 0.6 nozzle",
-            "BLOCKS RF50 0.8 nozzle"
-        ],
-        "Cubicon ABS @Cubicon xCeler-I 0.4 nozzle": [
-            "Cubicon xCeler-Plus 0.4 nozzle"
-        ],
-        "Cubicon ABS-A100 @Cubicon xCeler-I 0.4 nozzle": [
-            "Cubicon xCeler-Plus 0.4 nozzle"
-        ],
-        "Cubicon ABSk @Cubicon xCeler-I 0.4 nozzle": [
-            "Cubicon xCeler-Plus 0.4 nozzle"
-        ],
-        "Cubicon PA-CF @Cubicon xCeler-I 0.4 nozzle": [
-            "Cubicon xCeler-Plus 0.4 nozzle"
-        ],
-        "Cubicon PC @Cubicon xCeler-I 0.4 nozzle": [
-            "Cubicon xCeler-Plus 0.4 nozzle"
-        ],
-        "Cubicon PETG @Cubicon xCeler-I 0.4 nozzle": [
-            "Cubicon xCeler-Plus 0.4 nozzle"
-        ],
-        "Cubicon PLA @Cubicon xCeler-I 0.4 nozzle": [
-            "Cubicon xCeler-Plus 0.4 nozzle"
-        ],
-        "Cubicon PLA+ @Cubicon xCeler-I 0.4 nozzle": [
-            "Cubicon xCeler-Plus 0.4 nozzle"
-        ],
-        "Cubicon PLAi21 @Cubicon xCeler-I 0.4 nozzle": [
-            "Cubicon xCeler-Plus 0.4 nozzle"
-        ],
-        "Flashforge HS PLA": [
-            "Flashforge AD5X 0.4 nozzle",
-            "Flashforge AD5X 0.6 nozzle",
-            "Flashforge AD5X 0.8 nozzle"
-        ],
-        "Flashforge PETG-CF": [
-            "Flashforge AD5X 0.4 nozzle",
-            "Flashforge AD5X 0.6 nozzle",
-            "Flashforge AD5X 0.8 nozzle"
-        ],
-        "Flashforge PLA-CF": [
-            "Flashforge AD5X 0.4 nozzle",
-            "Flashforge AD5X 0.6 nozzle",
-            "Flashforge AD5X 0.8 nozzle"
-        ],
-        "Flashforge TPU 95A": [
-            "Flashforge AD5X 0.4 nozzle",
-            "Flashforge AD5X 0.6 nozzle",
-            "Flashforge AD5X 0.8 nozzle"
-        ],
-        "FusRock PAHT-CF": [
-            "Flashforge Guider 3 Ultra 0.6 Nozzle"
-        ],
-        "FusRock PET-CF": [
-            "Flashforge Guider 3 Ultra 0.6 Nozzle"
-        ],
-        "Generic ABS @Anycubic": [
-            "Anycubic Kobra 3 0.4 nozzle"
-        ],
-        "Generic ABS @Creality": [
-            "Creality CR-10 SE 0.2 nozzle",
-            "Creality CR-10 SE 0.4 nozzle",
-            "Creality CR-10 SE 0.6 nozzle",
-            "Creality CR-10 SE 0.8 nozzle",
-            "Creality CR-6 SE 0.2 nozzle",
-            "Creality CR-6 SE 0.4 nozzle",
-            "Creality CR-6 SE 0.6 nozzle",
-            "Creality CR-6 SE 0.8 nozzle",
-            "Creality CR-M4 0.4 nozzle",
-            "Creality Ender-3 V2 0.4 nozzle"
-        ],
-        "Generic ABS @Creality Ender-3V3-all": [
-            "Creality Ender-3 V3 Plus 0.4 nozzle",
-            "Creality Ender-3 V3 Plus 0.6 nozzle"
-        ],
-        "Generic ABS @Creality Hi-all": [
-            "Creality Hi 0.4 nozzle"
-        ],
-        "Generic ABS @Creality K1-all": [
-            "Creality K1 SE 0.4 nozzle",
-            "Creality K1C 0.4 nozzle"
-        ],
-        "Generic ABS @Creality K2-all": [
-            "Creality K2 0.4 nozzle",
-            "Creality K2 Plus 0.4 nozzle",
-            "Creality K2 Plus 0.6 nozzle",
-            "Creality K2 Plus 0.8 nozzle",
-            "Creality K2 Pro 0.4 nozzle"
-        ],
-        "Generic ABS @Flashforge G3U": [
-            "Flashforge Guider 3 Ultra 0.6 Nozzle"
-        ],
-        "Generic ASA @Creality Ender-3V3-all": [
-            "Creality Ender-3 V3 Plus 0.4 nozzle",
-            "Creality Ender-3 V3 Plus 0.6 nozzle"
-        ],
-        "Generic ASA @Creality K1-all": [
-            "Creality K1 SE 0.4 nozzle",
-            "Creality K1C 0.4 nozzle"
-        ],
-        "Generic ASA @Creality K2-all": [
-            "Creality K2 0.4 nozzle",
-            "Creality K2 Plus 0.4 nozzle",
-            "Creality K2 Pro 0.4 nozzle"
-        ],
-        "Generic ASA @Flashforge G3U": [
-            "Flashforge Guider 3 Ultra 0.6 Nozzle"
-        ],
-        "Generic HIPS @Flashforge": [
-            "Flashforge Guider 3 Ultra 0.6 Nozzle"
-        ],
-        "Generic PA @Prusa": [
-            "Prusa MINIIS 0.25 nozzle",
-            "Prusa MINIIS 0.4 nozzle",
-            "Prusa MINIIS 0.6 nozzle",
-            "Prusa MINIIS 0.8 nozzle"
-        ],
-        "Generic PA-CF @Creality Ender-3V3-all": [
-            "Creality Ender-3 V3 Plus 0.4 nozzle",
-            "Creality Ender-3 V3 Plus 0.6 nozzle"
-        ],
-        "Generic PA-CF @Creality K1-all": [
-            "Creality K1C 0.4 nozzle"
-        ],
-        "Generic PA-CF @Creality K2-all": [
-            "Creality K2 Plus 0.4 nozzle",
-            "Creality K2 Plus 0.6 nozzle",
-            "Creality K2 Plus 0.8 nozzle"
-        ],
-        "Generic PA-CF @Prusa": [
-            "Prusa MINIIS 0.25 nozzle",
-            "Prusa MINIIS 0.4 nozzle",
-            "Prusa MINIIS 0.6 nozzle",
-            "Prusa MINIIS 0.8 nozzle"
-        ],
-        "Generic PC @Creality K1-all": [
-            "Creality K1C 0.4 nozzle"
-        ],
-        "Generic PETG @Creality": [
-            "Creality CR-6 SE 0.2 nozzle",
-            "Creality CR-6 SE 0.4 nozzle",
-            "Creality CR-6 SE 0.6 nozzle",
-            "Creality CR-6 SE 0.8 nozzle",
-            "Creality CR-M4 0.4 nozzle"
-        ],
-        "Generic PETG @Creality Ender-3V3-all": [
-            "Creality Ender-3 V3 0.4 nozzle",
-            "Creality Ender-3 V3 0.6 nozzle",
-            "Creality Ender-3 V3 Plus 0.4 nozzle",
-            "Creality Ender-3 V3 Plus 0.6 nozzle",
-            "Creality Ender-3 V3 SE 0.2 nozzle",
-            "Creality Ender-3 V3 SE 0.4 nozzle",
-            "Creality Ender-3 V3 SE 0.6 nozzle",
-            "Creality Ender-3 V3 SE 0.8 nozzle"
-        ],
-        "Generic PETG @Creality Hi-all": [
-            "Creality Hi 0.4 nozzle"
-        ],
-        "Generic PETG @Creality K1-all": [
-            "Creality K1 SE 0.4 nozzle",
-            "Creality K1C 0.4 nozzle"
-        ],
-        "Generic PETG @Creality K2-all": [
-            "Creality K2 0.4 nozzle",
-            "Creality K2 Plus 0.4 nozzle",
-            "Creality K2 Plus 0.6 nozzle",
-            "Creality K2 Plus 0.8 nozzle",
-            "Creality K2 Pro 0.4 nozzle"
-        ],
-        "Generic PETG @Flashforge G3U": [
-            "Flashforge Guider 3 Ultra 0.6 Nozzle",
-            "Flashforge Guider 3 Ultra 0.8 Nozzle"
-        ],
-        "Generic PETG @Sovol Zero Hardened Steel nozzle": [
-            "Sovol Zero 0.4 nozzle"
-        ],
-        "Generic PETG HF @BBL X1C": [
-            "Bambu Lab P1S 0.4 nozzle",
-            "Bambu Lab P1S 0.6 nozzle",
-            "Bambu Lab X1 0.4 nozzle",
-            "Bambu Lab X1 0.6 nozzle",
-            "Bambu Lab X1 0.8 nozzle"
-        ],
-        "Generic PETG-CF @Flashforge G3U": [
-            "Flashforge Guider 3 Ultra 0.6 Nozzle",
-            "Flashforge Guider 3 Ultra 0.8 Nozzle"
-        ],
-        "Generic PLA @Creality": [
-            "Creality CR-10 SE 0.2 nozzle",
-            "Creality CR-10 SE 0.4 nozzle",
-            "Creality CR-10 SE 0.6 nozzle",
-            "Creality CR-10 SE 0.8 nozzle",
-            "Creality CR-6 SE 0.2 nozzle",
-            "Creality CR-6 SE 0.4 nozzle",
-            "Creality CR-6 SE 0.6 nozzle",
-            "Creality CR-6 SE 0.8 nozzle",
-            "Creality CR-M4 0.4 nozzle"
-        ],
-        "Generic PLA @Creality Ender-3V3-all": [
-            "Creality Ender-3 V3 0.4 nozzle",
-            "Creality Ender-3 V3 0.6 nozzle",
-            "Creality Ender-3 V3 Plus 0.4 nozzle",
-            "Creality Ender-3 V3 Plus 0.6 nozzle"
-        ],
-        "Generic PLA @Creality K1-all": [
-            "Creality K1 SE 0.4 nozzle",
-            "Creality K1C 0.4 nozzle"
-        ],
-        "Generic PLA @Creality K2-all": [
-            "Creality K2 0.4 nozzle",
-            "Creality K2 Plus 0.4 nozzle",
-            "Creality K2 Plus 0.6 nozzle",
-            "Creality K2 Plus 0.8 nozzle",
-            "Creality K2 Pro 0.4 nozzle"
-        ],
-        "Generic PLA @Flashforge G3U": [
-            "Flashforge Guider 3 Ultra 0.6 Nozzle",
-            "Flashforge Guider 3 Ultra 0.8 Nozzle"
-        ],
-        "Generic PLA @Hi-all": [
-            "Creality Hi 0.4 nozzle",
-            "Creality Hi 0.6 nozzle"
-        ],
-        "Generic PLA @Sovol Zero Hardened Steel nozzle": [
-            "Sovol Zero 0.4 nozzle"
-        ],
-        "Generic PLA Silk @Sovol Zero Hardened Steel nozzle": [
-            "Sovol Zero 0.4 nozzle"
-        ],
-        "Generic PLA-CF @Creality K1-all": [
-            "Creality K1 SE 0.4 nozzle",
-            "Creality K1C 0.4 nozzle"
-        ],
-        "Generic PLA-CF @Creality K2-all": [
-            "Creality K2 0.4 nozzle",
-            "Creality K2 Plus 0.4 nozzle",
-            "Creality K2 Pro 0.4 nozzle"
-        ],
-        "Generic PLA-CF @Flashforge G3U": [
-            "Flashforge Guider 3 Ultra 0.6 Nozzle",
-            "Flashforge Guider 3 Ultra 0.8 Nozzle"
-        ],
-        "Generic PLA-CF @Prusa": [
-            "Prusa MINIIS 0.25 nozzle",
-            "Prusa MINIIS 0.4 nozzle",
-            "Prusa MINIIS 0.6 nozzle",
-            "Prusa MINIIS 0.8 nozzle"
-        ],
-        "Generic TPU @Anycubic": [
-            "Anycubic Kobra 3 0.4 nozzle"
-        ],
-        "Generic TPU @Creality": [
-            "Creality CR-10 SE 0.2 nozzle",
-            "Creality CR-10 SE 0.4 nozzle",
-            "Creality CR-10 SE 0.6 nozzle",
-            "Creality CR-10 SE 0.8 nozzle"
-        ],
-        "Generic TPU @Creality Ender-3V3-all": [
-            "Creality Ender-3 V3 0.4 nozzle",
-            "Creality Ender-3 V3 0.6 nozzle",
-            "Creality Ender-3 V3 Plus 0.4 nozzle",
-            "Creality Ender-3 V3 Plus 0.6 nozzle",
-            "Creality Ender-3 V3 SE 0.2 nozzle",
-            "Creality Ender-3 V3 SE 0.4 nozzle",
-            "Creality Ender-3 V3 SE 0.6 nozzle",
-            "Creality Ender-3 V3 SE 0.8 nozzle"
-        ],
-        "Generic TPU @Creality K1-all": [
-            "Creality K1 SE 0.4 nozzle",
-            "Creality K1C 0.4 nozzle"
-        ],
-        "Generic TPU @Creality K2-all": [
-            "Creality K2 0.4 nozzle",
-            "Creality K2 Plus 0.4 nozzle",
-            "Creality K2 Pro 0.4 nozzle"
-        ],
-        "HATCHBOX PETG @0.2 nozzle": [
-            "Qidi Q1 Pro 0.2 nozzle"
-        ],
-        "QIDI PETG Basic @0.2 nozzle": [
-            "Qidi Q1 Pro 0.2 nozzle"
-        ],
-        "QIDI PETG Rapido @0.2 nozzle": [
-            "Qidi Q1 Pro 0.2 nozzle"
-        ],
-        "QIDI PETG Translucent @0.2 nozzle": [
-            "Qidi Q1 Pro 0.2 nozzle"
-        ],
-        "re3D PC @0.4 nozzle": [
-            "re3D Gigabot 4 0.8 nozzle",
-            "re3D Gigabot 4 XLT 0.8 nozzle",
-            "re3D Terabot 4 0.8 nozzle"
-        ],
-        "re3D PETG @0.4 nozzle": [
-            "re3D Gigabot 4 0.8 nozzle",
-            "re3D Gigabot 4 XLT 0.8 nozzle",
-            "re3D Terabot 4 0.8 nozzle"
-        ],
-        "re3D PLA @0.4 nozzle": [
-            "re3D Gigabot 4 0.8 nozzle",
-            "re3D Gigabot 4 XLT 0.8 nozzle",
-            "re3D Terabot 4 0.8 nozzle"
-        ],
-        "re3D rPETG @0.8 nozzle": [
-            "re3D GigabotX 2 1.75 nozzle",
-            "re3D GigabotX 2 XLT 1.75 nozzle",
-            "re3D TerabotX 2 1.75 nozzle"
-        ],
-        "re3D rPP @0.8 nozzle": [
-            "re3D GigabotX 2 1.75 nozzle",
-            "re3D GigabotX 2 XLT 1.75 nozzle",
-            "re3D TerabotX 2 1.75 nozzle"
-        ]
-    }
-}

resources/profiles/BBL.json

@@ -1,7 +1,7 @@
 {
 	"name": "Bambulab",
 	"url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
-	"version": "02.08.00.14",
+	"version": "02.08.00.15",
 	"force_update": "0",
 	"description": "the initial version of BBL configurations",
 	"machine_model_list": [

scripts/ci_deps_cache.sh

@@ -1,21 +1,27 @@
 #!/usr/bin/env bash
-# Lets a pull request's macOS deps build wait for a push build of the base
-# branch that builds the same deps, from a Linux job. `check` runs after a cache
-# miss and names a queued or running base build with the same deps/ and .github/
-# to wait for, unless the pull request changes either. `wait` waits until that
-# build saves KEY. actions/cache then confirms the entry can be restored.
+# Lets a pull request's macOS deps build, or its clang-tidy job, wait for a
+# build that saves the deps cache it needs, from a Linux job. `check` runs after
+# a cache miss and names a queued or running push build of the base branch with
+# the same deps/ and .github/ to wait for, unless the pull request changes either.
+# `own` names the pull request's own build instead, for clang-tidy when the pull
+# request changes deps/. `wait` waits until that build saves KEY under CACHE_REF,
+# or its deps job fails. actions/cache then confirms the entry can be restored.
 #
-# Environment: GH_TOKEN, REPO, WORKFLOW_REF and BASE_REF, plus KEY_INPUTS,
-# WAIT_FOR, WAIT_SINCE, WAIT_MINUTES, KEY and ARCH for `wait`.
+# Environment: GH_TOKEN, REPO, WORKFLOW_REF (or WORKFLOW, the build workflow's
+# file name) and BASE_REF, plus HEAD_SHA for `own`, and KEY_INPUTS, WAIT_FOR,
+# WAIT_SINCE, WAIT_MINUTES, KEY, CACHE_REF (default the base branch) and ARCH
+# (or JOB, the matrix job's name) for `wait`.
 # Writes key-inputs, wait-for and wait-since to $GITHUB_OUTPUT.
 set -uo pipefail
 
-workflow=${WORKFLOW_REF%%@*}
-workflow=${workflow##*/}
+workflow=${WORKFLOW_REF:-}
+workflow=${workflow%%@*}
+workflow=${WORKFLOW:-${workflow##*/}}
 
 # Must match the job names in build_all.yml, build_check_cache.yml and build_deps.yml.
-check_job_name="build_macos_arch (${ARCH:-}) / Check Cache"
-deps_job_name="build_macos_arch (${ARCH:-}) / Build Deps / Build Deps"
+job=${JOB:-build_macos_arch (${ARCH:-})}
+check_job_name="$job / Check Cache"
+deps_job_name="$job / Build Deps / Build Deps"
 
 out() { echo "$1" >> "${GITHUB_OUTPUT:-/dev/stdout}"; }
 
@@ -63,8 +69,27 @@ check() {
   fi
 }
 
+own() {
+  out "key-inputs=$(local_key_inputs HEAD)"
+  local id
+  # The build can be created a moment after this job.
+  for _ in 1 2 3 4 5; do
+    id=$(gh api -X GET "repos/$REPO/actions/workflows/$workflow/runs" \
+      -f head_sha="$HEAD_SHA" -f event=pull_request -f per_page=1 --jq '.workflow_runs[0].id // empty' < /dev/null)
+    [ -n "$id" ] && break
+    sleep 30
+  done
+  if [ -n "$id" ]; then
+    echo "Waiting for the deps cache of build $id of this pull request."
+    out "wait-for=$id"
+    out "wait-since=$(date +%s)"
+  else
+    echo "No build of this pull request is building its deps."
+  fi
+}
+
 key_saved() {
-  gh cache list -R "$REPO" --ref "refs/heads/$BASE_REF" --key "$KEY" --json key < /dev/null \
+  gh cache list -R "$REPO" --ref "${CACHE_REF:-refs/heads/$BASE_REF}" --key "$KEY" --json key < /dev/null \
     | jq -e --arg key "$KEY" 'any(.[]; .key == $key)' > /dev/null
 }
 
@@ -87,11 +112,11 @@ wait_for() {
           key_saved && { echo "Found $KEY."; return; }
           sleep 20
         done
-        echo "Build $id of $BASE_REF finished its deps without saving $KEY."
+        echo "Build $id finished its deps without saving $KEY."
         return ;;
       "completed cancelled") ;;
       completed*)
-        echo "The deps job of build $id of $BASE_REF did not succeed."
+        echo "The deps job of build $id did not succeed."
         return ;;
       # The deps job exists only once the build's cache check has succeeded.
       "")
@@ -100,7 +125,7 @@ wait_for() {
           completed*)
             check=$(jq -r --arg name "$check_job_name" 'first(.jobs[] | select(.name == $name) | .conclusion) // ""' <<< "$jobs")
             if [ -z "$warned" ] && { [ -z "$check" ] || [ "$check" = success ]; }; then
-              echo "::warning title=Deps wait::Build $id of $BASE_REF has no job named \"$deps_job_name\". If the build jobs were renamed, update scripts/ci_deps_cache.sh. This does not affect this pull request."
+              echo "::warning title=Deps wait::Build $id has no job named \"$deps_job_name\". If the build jobs were renamed, update scripts/ci_deps_cache.sh. This does not affect this pull request."
               warned=1
             fi ;;
           *)
@@ -118,11 +143,12 @@ wait_for() {
     seen="$seen $id"
     echo "Following build $id of $BASE_REF."
   done
-  echo "No build of $BASE_REF saved $KEY."
+  echo "No build saved $KEY."
 }
 
 case "${1:-}" in
   check) check ;;
+  own) own ;;
   wait) wait_for ;;
-  *) echo "usage: $0 check|wait" >&2; exit 2 ;;
+  *) echo "usage: $0 check|own|wait" >&2; exit 2 ;;
 esac

scripts/orca_profile_tool.py

@@ -11,7 +11,6 @@ commands:
   normalize        rewrite profile files into their canonical shape
   trim             delete profile files no <vendor>.json list references
   update-index     regenerate the *_list sections of <vendor>.json
-  legacy-compat    write the printers user presets can be migrated back to
 
 options shared by several commands:
   --vendor VENDOR      act on one vendor bundle only; repeatable, empty means all
@@ -25,9 +24,6 @@ After adding, renaming or deleting profile files, run:
   normalize -> update-index -> generate-id -> check
 normalize supplies missing types; update-index registers presets before id
 generation.
-After renaming filament presets or narrowing their compatible_printers, also
-rerun legacy-compat --base <2.4.2 profiles> so user presets made against 2.4.2
-can be migrated back to their printers.
 Use trim only for deliberate cleanup, previewed with --dry-run: it judges against
 the current index and can delete newly added, unindexed presets.
 
@@ -3076,131 +3072,6 @@ def fix_variant_arrays(profiles_dir=PROFILES_DIR, vendors=None, dry_run=False, s
     return len(changed), errors
 
 
-# ---------------------------------------------------------------------------
-# legacy-compat
-# ---------------------------------------------------------------------------
-
-LEGACY_COMPAT_PATH = os.path.normpath(
-    os.path.join(SCRIPTS_DIR, "..", "resources", "info", "legacy_compatible_printers.json"))
-
-
-def _renamed_from(data):
-    """A preset's renamed_from names. Profiles write one ';'-separated string, as the
-    loader's unescape_strings_cstyle reads it; none of them quote or escape a name."""
-    value = data.get("renamed_from") or []
-    return [n for v in _as_list(value) for n in v.split(";") if n]
-
-
-def _flatten_presets(profiles_dir):
-    """Every bundle's composed filament and printer presets, for legacy-compat.
-
-    Returns (filaments, printers): filaments maps (vendor, name) to a dict with the
-    resolved compatible_printers, filament_id, extruder variants, renamed_from and
-    whether it is instantiated; printers maps each instantiated printer name to a
-    dict with its renamed_from and extruder variants. instantiation is read from the
-    preset's own file, as the loader requires every file to state it.
-    """
-    def instantiated(data):
-        return str(data.get("instantiation", "")).lower() == "true"
-
-    ofl = load_vendor_configs(profiles_dir, OFL)["filament"]
-    filaments, printers = {}, {}
-    for vendor in list_vendor_names(profiles_dir):
-        configs = load_vendor_configs(profiles_dir, vendor)
-        cache = {}
-        for name, (_rel, data) in configs["filament"].items():
-            config = compose_config(name, configs["filament"], ofl, cache, vendor == OFL)
-            filaments[(vendor, name)] = {
-                "compatible_printers": set(_as_list(config.get("compatible_printers", ([],))[0])),
-                "filament_id": config.get("filament_id", (None,))[0],
-                "variants": set(_as_list(config.get("filament_extruder_variant", ([],))[0])),
-                "instantiation": instantiated(data),
-                "renamed_from": _renamed_from(data),
-            }
-        cache = {}
-        for name, (_rel, data) in configs["machine"].items():
-            if instantiated(data):
-                config = compose_config(name, configs["machine"], {}, cache)
-                printers[name] = {
-                    "renamed_from": _renamed_from(data),
-                    "variants": set(_as_list(config.get("printer_extruder_variant", ([],))[0])),
-                }
-    return filaments, printers
-
-
-def legacy_compatible_printers(base_dir, profiles_dir=PROFILES_DIR):
-    """Printers each current system filament preset covered in the base release
-    but no longer lists, kept only where a current preset with the same
-    filament_id still covers that printer.
-
-    User presets store only their diff, so they inherit their parent's
-    compatible_printers; when a profile change narrows that list, a user preset
-    made against the base release disappears from printers it was used on. The
-    app offers to write these printers into such user presets. Requiring a same-id
-    successor leaves out printers a filament was deliberately taken off, and
-    requiring a shared extruder variant keeps a printer from picking up another
-    variant's values.
-
-    Keyed by the current preset name: the app resolves a renamed parent
-    before the map is consulted. Printer names are translated through the
-    printers' renamed_from. Returns {preset name: sorted printer names}.
-    """
-    old_filaments, _ = _flatten_presets(base_dir)
-    new_filaments, new_printers = _flatten_presets(profiles_dir)
-    renamed_printer = {old: new for new, rec in new_printers.items() for old in rec["renamed_from"]}
-
-    old_by_name = {}
-    for (vendor, name), rec in old_filaments.items():
-        old_by_name.setdefault(name, []).append((vendor, rec))
-
-    covering = {}  # filament_id -> printers some current instantiated preset covers
-    for rec in new_filaments.values():
-        if rec["instantiation"] and rec["filament_id"]:
-            covering.setdefault(rec["filament_id"], set()).update(rec["compatible_printers"])
-
-    def shares_variant(filament, printer):
-        variants = new_printers[printer]["variants"]
-        return not filament["variants"] or not variants or bool(filament["variants"] & variants)
-
-    result = {}
-    for (vendor, name), rec in sorted(new_filaments.items()):
-        # An empty list means every printer, so nothing can have been lost.
-        if not rec["instantiation"] or not rec["compatible_printers"]:
-            continue
-        old_printers = set()
-        for old_name in [name] + rec["renamed_from"]:
-            candidates = old_by_name.get(old_name, [])
-            same_vendor = [r for v, r in candidates if v == vendor]
-            for old in same_vendor or [r for _, r in candidates]:
-                old_printers |= old["compatible_printers"]
-        old_printers = {renamed_printer.get(p, p) for p in old_printers}
-        lost = old_printers - rec["compatible_printers"]
-        lost &= covering.get(rec["filament_id"], set()) & set(new_printers)
-        lost = {p for p in lost if shares_variant(rec, p)}
-        if lost:
-            result[name] = sorted(lost)
-    return result
-
-
-def run_legacy_compat(base_dir, profiles_dir, output, check):
-    presets = legacy_compatible_printers(base_dir, profiles_dir)
-    if check:
-        try:
-            with open(output, encoding="utf-8") as f:
-                current = json.load(f).get("presets")
-        except (OSError, ValueError, AttributeError):
-            current = None
-        if current != presets:
-            print_error(f"{output} is out of date; rerun legacy-compat --base {base_dir}")
-            return 1
-        print_success(f"{output} is up to date")
-        return 0
-    with open(output, "w", encoding="utf-8", newline="\n") as f:
-        f.write(json.dumps({"presets": presets}, indent=4, sort_keys=True, ensure_ascii=False) + "\n")
-    print_info(f"wrote {len(presets)} presets / {sum(map(len, presets.values()))} printers to {output}")
-    return 0
-
-
 # ---------------------------------------------------------------------------
 # CLI
 # ---------------------------------------------------------------------------
@@ -3222,17 +3093,11 @@ examples:
       preview resizing the variant arrays check rejects in that bundle
   orca_profile_tool.py check --strict --vendor BBL
       also hold every preset's inherited variant arrays to its own width
-  orca_profile_tool.py legacy-compat --base /tmp/v2.4.2/resources/profiles
-      rewrite resources/info/legacy_compatible_printers.json against 2.4.2's
-      profiles (git archive v2.4.2 resources/profiles | tar -x -C /tmp/v2.4.2)
 
 after adding, renaming or deleting profile files, run in this order:
   normalize -> update-index -> generate-id -> check
 normalize supplies missing types; update-index registers presets before id
 generation.
-After renaming filament presets or narrowing their compatible_printers, also
-rerun legacy-compat --base <2.4.2 profiles> so user presets made against 2.4.2
-can be migrated back to their printers.
 Use trim only for deliberate cleanup, previewed with --dry-run: it judges against
 the current index and can delete newly added, unindexed presets.
 """
@@ -3362,22 +3227,6 @@ def build_parser():
         "Use trim only for deliberate unindexed-file cleanup, previewed with\n"
         "--dry-run; it can also delete newly authored presets.")
 
-    legacy_cmd = add(
-        "legacy-compat", [profiles_opt],
-        "write the printers user presets keep from an older release",
-        "Compare the tree with an older release's profiles and write, per current\n"
-        "filament preset, the printers it covered then and no longer lists, where a\n"
-        "preset with the same filament_id still covers them. The loader adds these\n"
-        "to user presets that inherit the preset, so a narrowed compatible_printers\n"
-        "does not hide them on printers they were made for.")
-    legacy_cmd.add_argument("--base", required=True, metavar="DIR",
-                            help="the older release's resources/profiles directory")
-    legacy_cmd.add_argument("--output", default=LEGACY_COMPAT_PATH, metavar="FILE",
-                            help="map to write (default: resources/info/"
-                                 "legacy_compatible_printers.json)")
-    legacy_cmd.add_argument("--check", action="store_true",
-                            help="fail if the map differs from what --base implies; write nothing")
-
     return parser
 
 
@@ -3411,9 +3260,6 @@ def main(argv=None):
         return run_generate_id(profiles_dir, vendors, args.filament_id, args.setting_id,
                                args.dry_run)
 
-    if args.command == "legacy-compat":
-        return run_legacy_compat(args.base, profiles_dir, args.output, args.check)
-
     if args.command == "fix-variant":
         _changed, errors = fix_variant_arrays(profiles_dir, vendors, dry_run=args.dry_run,
                                                strict=args.strict)

scripts/tests/test_profile_tool.py

@@ -1258,97 +1258,6 @@ class TestVariantNames(TreeCase):
         self.assertIn('holds the legacy variant "Direct Drive Normal"', out)
 
 
-# ---------------------------------------------------------------------------
-# legacy-compat
-# ---------------------------------------------------------------------------
-
-class TestLegacyCompat(unittest.TestCase):
-    """A base release and the current tree, each with one vendor."""
-
-    def setUp(self):
-        self.base, self.cur = Tree(), Tree()
-        self.addCleanup(self.base.cleanup)
-        self.addCleanup(self.cur.cleanup)
-
-    @staticmethod
-    def printer(tree, name, **extra):
-        tree.write("V", f"machine/{name}.json",
-                   {"type": "machine", "name": name, "instantiation": "true", **extra})
-        tree.index("V", "machine", name, f"machine/{name}.json")
-
-    @staticmethod
-    def filament(tree, name, printers, filament_id="OFpetg01", **extra):
-        tree.write("V", f"filament/{name}.json",
-                   {"type": "filament", "name": name, "instantiation": "true",
-                    "filament_id": filament_id, "compatible_printers": printers, **extra})
-        tree.index("V", "filament", name, f"filament/{name}.json")
-
-    def generate(self):
-        return apt.legacy_compatible_printers(self.base.profiles, self.cur.profiles)
-
-    def test_renamed_and_narrowed_preset_keeps_printers_a_same_id_sibling_covers(self):
-        for tree in (self.base, self.cur):
-            for p in ("A 0.4", "A 0.6", "B 0.4"):
-                self.printer(tree, p)
-        self.filament(self.base, "PETG @A-all", ["A 0.4", "A 0.6", "B 0.4"])
-        self.filament(self.cur, "PETG @V A-all", ["A 0.6"], renamed_from="PETG @A-all;PETG A-all")
-        self.filament(self.cur, "PETG @A 0.4", ["A 0.4"])
-        self.assertEqual(self.generate(), {"PETG @V A-all": ["A 0.4"]})
-
-    def test_printer_without_a_successor_is_left_out(self):
-        for tree in (self.base, self.cur):
-            for p in ("A 0.4", "A 0.6"):
-                self.printer(tree, p)
-        self.filament(self.base, "PETG @A", ["A 0.4", "A 0.6"])
-        self.filament(self.cur, "PETG @A", ["A 0.6"])
-        self.filament(self.cur, "Other @A", ["A 0.4"], filament_id="OFother1")
-        self.assertEqual(self.generate(), {})
-
-    def test_printer_names_follow_printer_renames(self):
-        self.printer(self.base, "Old 0.4")
-        self.printer(self.base, "A 0.6")
-        self.printer(self.cur, "New 0.4", renamed_from="Old 0.4")
-        self.printer(self.cur, "A 0.6")
-        self.filament(self.base, "PETG @A", ["Old 0.4", "A 0.6"])
-        self.filament(self.cur, "PETG @A", ["A 0.6"])
-        self.filament(self.cur, "PETG @New", ["New 0.4"])
-        self.assertEqual(self.generate(), {"PETG @A": ["New 0.4"]})
-
-    def test_printer_without_a_shared_extruder_variant_is_left_out(self):
-        for tree in (self.base, self.cur):
-            self.printer(tree, "Direct 0.4", printer_extruder_variant=["Direct Drive Standard"])
-            self.printer(tree, "Bowden 0.4", printer_extruder_variant=["Bowden Standard"])
-        self.filament(self.base, "PETG @all", ["Direct 0.4", "Bowden 0.4"])
-        self.filament(self.cur, "PETG @all", ["Direct 0.4"],
-                      filament_extruder_variant=["Direct Drive Standard"])
-        self.filament(self.cur, "PETG @Bowden", ["Bowden 0.4"])
-        self.assertEqual(self.generate(), {})
-
-    def test_preset_now_listing_no_printer_is_skipped(self):
-        for tree in (self.base, self.cur):
-            self.printer(tree, "A 0.4")
-        self.filament(self.base, "PETG @A", ["A 0.4"])
-        self.filament(self.cur, "PETG @A", [])
-        self.assertEqual(self.generate(), {})
-
-    def test_check_passes_on_a_current_map_and_fails_on_a_stale_one(self):
-        for tree in (self.base, self.cur):
-            for p in ("A 0.4", "A 0.6"):
-                self.printer(tree, p)
-        self.filament(self.base, "PETG @A", ["A 0.4", "A 0.6"])
-        self.filament(self.cur, "PETG @A", ["A 0.6"])
-        self.filament(self.cur, "PETG @A 0.4", ["A 0.4"])
-        output = os.path.join(self.cur.dir, "map.json")
-        argv = ["legacy-compat", "--base", self.base.profiles, "--profiles", self.cur.profiles,
-                "--output", output]
-        with contextlib.redirect_stdout(io.StringIO()):
-            self.assertEqual(apt.main(argv), 0)
-            self.assertEqual(apt.main(argv + ["--check"]), 0)
-            with open(output, "w", encoding="utf-8") as f:
-                json.dump({"presets": {}}, f)
-            self.assertEqual(apt.main(argv + ["--check"]), 1)
-
-
 class TestDispatch(TreeCase):
     def test_each_command_reaches_its_own_writer(self):
         self.t.write("V", "filament/A.json", {"type": "filament", "name": "A"})

src/OrcaSlicer.cpp

@@ -99,6 +99,7 @@
 #include "libslic3r/Preset.hpp"
 #include "libslic3r/Geometry.hpp"
 #include "libslic3r/GCode.hpp"
+#include "libslic3r/MeshRepair.hpp"
 #include "libslic3r/Model.hpp"
 #include "libslic3r/ModelArrange.hpp"
 #include "libslic3r/Platform.hpp"
@@ -206,7 +207,7 @@ std::map<int, std::string> cli_errors = {
     {CLI_OBJECT_ORIENT_FAILED, "An error occurred when auto-orienting object(s)."},
     {CLI_MODIFIED_PARAMS_TO_PRINTER, "Found modified parameter in printer preset in the 3mf file, which should not be changed."},
         {CLI_FILE_VERSION_NOT_SUPPORTED, "Unsupported 3MF version. Please make sure the 3MF file was created with the official version of Bambu Studio, not a beta version."},
-    {CLI_NO_SUITABLE_OBJECTS, "One of the plate is empty or has no object fully inside it. Please check that the 3mf contains no empty plate in Orca Slicer before uploading."},
+    {CLI_NO_SUITABLE_OBJECTS, "The plate has nothing to slice: it is empty, or no object on it is both printable and fully inside the print volume."},
     {CLI_VALIDATE_ERROR, "There are some incorrect slicing parameters in the 3mf. Please verify the slicing of all plates in Orca Slicer before uploading."},
     {CLI_OBJECTS_PARTLY_INSIDE, "Some objects are located over the boundary of the heated bed."},
     {CLI_EXPORT_CACHE_DIRECTORY_CREATE_FAILED, "Failed creating directory when exporting cache data."},
@@ -1463,7 +1464,7 @@ int CLI::run(int argc, char **argv)
     //int arrange_option;
     int plate_to_slice = 0, filament_count = 0, duplicate_count = 0, real_duplicate_count = 0, current_extruder_count = 1, new_extruder_count = 1, current_printer_variant_count = 1, current_print_variant_count = 1, new_printer_variant_count = 1;
     bool first_file = true, is_bbl_3mf = false, need_arrange = true, has_thumbnails = false, up_config_to_date = false, normative_check = true, duplicate_single_object = false, use_first_fila_as_default = false, minimum_save = false, enable_timelapse = false;
-    bool allow_rotations = true, skip_modified_gcodes = false, avoid_extrusion_cali_region = false, skip_useless_pick = false, allow_newer_file = false, current_is_multi_extruder = false, new_is_multi_extruder = false, allow_mix_temp = false, enable_wrapping_detect = false;
+    bool allow_rotations = false, skip_modified_gcodes = false, avoid_extrusion_cali_region = false, skip_useless_pick = false, allow_newer_file = false, current_is_multi_extruder = false, new_is_multi_extruder = false, allow_mix_temp = false, enable_wrapping_detect = false;
     Semver file_version;
     std::map<size_t, bool> orients_requirement;
     std::vector<Preset*> project_presets;
@@ -5130,9 +5131,19 @@ int CLI::run(int argc, char **argv)
                 }
             }
         } else if (opt_key == "repair") {
-            // Models are repaired by default.
-            //for (auto &model : m_models)
-            //    model.repair();
+            if (m_config.opt_bool(opt_key))
+                for (Model &model : m_models)
+                    for (ModelObject *object : model.objects) {
+                        for (ModelVolume *volume : object->volumes) {
+                            MeshRepairStats stats;
+                            std::string     error;
+                            if (!volume->repair(true, &stats, &error))
+                                BOOST_LOG_TRIVIAL(warning) << "repair of " << object->name << " / " << volume->name << " failed: " << error;
+                            else if (stats.modified)
+                                BOOST_LOG_TRIVIAL(info) << "repaired " << object->name << " / " << volume->name;
+                        }
+                        object->invalidate_bounding_box();
+                    }
         } else {
             boost::nowide::cerr << "error: option not implemented yet: " << opt_key << std::endl;
             record_exit_reson(outfile_dir, CLI_UNSUPPORTED_OPERATION, 0, cli_errors[CLI_UNSUPPORTED_OPERATION], sliced_info);
@@ -5142,6 +5153,7 @@ int CLI::run(int argc, char **argv)
 
     BOOST_LOG_TRIVIAL(info) << "finished model pre-process commands\n";
     bool oriented_or_arranged = false;
+    bool arranged_without_rotations = false;
     //BBS: add orient and arrange logic here
     for (auto& model : m_models)
     {
@@ -5409,6 +5421,7 @@ int CLI::run(int argc, char **argv)
                 BOOST_LOG_TRIVIAL(info) << boost::format("start plate %1%'s arranging...") % (i + 1);
                 arrangement::arrange(selected, unselected, beds, arrange_cfg);
                 //arrangement::arrange(unprintable, {}, beds, arrange_cfg);
+                arranged_without_rotations |= !arrange_cfg.allow_rotations;
                 BOOST_LOG_TRIVIAL(info) << boost::format("finished plate %1%'s arranging") % (i + 1);
 
                 //step-4: postprocess the bed index and result
@@ -5881,6 +5894,7 @@ int CLI::run(int argc, char **argv)
                 BOOST_LOG_TRIVIAL(info) << boost::format("start %1% th arranging...")%arrange_count;
                 arrangement::arrange(selected, unselected, beds, arrange_cfg);
                 arrangement::arrange(unprintable, {}, beds, arrange_cfg);
+                arranged_without_rotations |= !arrange_cfg.allow_rotations;
                 BOOST_LOG_TRIVIAL(info) << boost::format("finished %1% th arranging...")%arrange_count;
 
                 //Step-4:postprocess by partplate list&&apply the result
@@ -6425,7 +6439,15 @@ int CLI::run(int argc, char **argv)
 
                         if (count == 0) {
                             BOOST_LOG_TRIVIAL(error) << "plate "<< index+1<< ": Nothing to be sliced, Either the print is empty or no object is fully inside the print volume before apply." << std::endl;
-                            record_exit_reson(outfile_dir, CLI_NO_SUITABLE_OBJECTS, index+1, cli_errors[CLI_NO_SUITABLE_OBJECTS], sliced_info);
+                            std::string no_objects_reason = cli_errors[CLI_NO_SUITABLE_OBJECTS];
+                            if (arranged_without_rotations) {
+                                //ORCA: result.json is only written on Linux, so also print the reason to stderr.
+                                no_objects_reason = "No object is fully inside the print volume. Arrange ran without rotations."
+                                                    " If an object only fits the bed when rotated, pass --allow-rotations."
+                                                    " Otherwise the plate is empty or an object is larger than the printable area or height.";
+                                boost::nowide::cerr << "plate " << index+1 << ": " << no_objects_reason << std::endl;
+                            }
+                            record_exit_reson(outfile_dir, CLI_NO_SUITABLE_OBJECTS, index+1, no_objects_reason, sliced_info);
                             flush_and_exit(CLI_NO_SUITABLE_OBJECTS);
                         }
                         else if ((plate_to_slice != 0) || pre_check) {

src/libslic3r/CMakeLists.txt

@@ -625,6 +625,7 @@ add_library(libslic3r_cgal STATIC
     CutSurface.hpp CutSurface.cpp
     IntersectionPoints.hpp IntersectionPoints.cpp
     MeshBoolean.hpp MeshBoolean.cpp
+    MeshRepair.hpp MeshRepair.cpp
     TryCatchSignal.hpp TryCatchSignal.cpp
     Triangulation.hpp Triangulation.cpp
 )
@@ -652,7 +653,9 @@ if (IS_CLANG_CL)
     target_compile_options(libslic3r_cgal PRIVATE -Wno-overriding-option)
 endif ()
 
-target_link_libraries(libslic3r_cgal PRIVATE ${_cgal_tgt} admesh libigl mcut boost_libs)
+# Lets CGAL algorithms given CGAL::Parallel_if_available_tag run on TBB.
+target_compile_definitions(libslic3r_cgal PRIVATE CGAL_LINKED_WITH_TBB)
+target_link_libraries(libslic3r_cgal PRIVATE ${_cgal_tgt} admesh libigl mcut boost_libs TBB::tbb)
 
 if (MSVC AND "${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") # 32 bit MSVC workaround
     target_compile_definitions(libslic3r_cgal PRIVATE CGAL_DO_NOT_USE_MPZF)

src/libslic3r/Format/STEP.cpp

@@ -236,19 +236,29 @@ static void getNamedSolids(const TopLoc_Location& location,
         int                      i = 0;
         switch (shape_type) {
         case TopAbs_COMPOUND:
-            if (!isSplitCompound) {
-                namedSolids.emplace_back(TopoDS::Compound(transform.Shape()), fullName);
-                break;
-            }
         case TopAbs_COMPSOLID:
             if (!isSplitCompound) {
-                namedSolids.emplace_back(TopoDS::CompSolid(transform.Shape()), fullName);
+                namedSolids.emplace_back(transform.Shape(), fullName);
             } else {
                 for (explorer.Init(transform.Shape(), TopAbs_SOLID); explorer.More(); explorer.Next()) {
                     i++;
                     const TopoDS_Shape& currentShape = explorer.Current();
                     namedSolids.emplace_back(TopoDS::Solid(currentShape), fullName + "-SOLID-" + std::to_string(i));
                 }
+                // Surface models have no solids: each shell outside a solid is a part, and loose faces stay together.
+                i = 0;
+                for (explorer.Init(transform.Shape(), TopAbs_SHELL, TopAbs_SOLID); explorer.More(); explorer.Next())
+                    namedSolids.emplace_back(explorer.Current(), fullName + "-SHELL-" + std::to_string(++i));
+                TopoDS_Compound loose_faces;
+                TopoDS_Builder  builder;
+                builder.MakeCompound(loose_faces);
+                bool has_loose_faces = false;
+                for (explorer.Init(transform.Shape(), TopAbs_FACE, TopAbs_SHELL); explorer.More(); explorer.Next()) {
+                    builder.Add(loose_faces, explorer.Current());
+                    has_loose_faces = true;
+                }
+                if (has_loose_faces)
+                    namedSolids.emplace_back(loose_faces, fullName);
             }
             break;
         case TopAbs_SOLID:

src/libslic3r/GCode.cpp

@@ -1033,6 +1033,15 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
         return buf;
     }
 
+    // FanMover consumes these markers (and drops them) to avoid splitting a G1 inside custom gcode.
+    // Only written when FanMover runs, the same gate as its construction in GCode::process_layers.
+    static std::string wrap_custom_gcode_for_fan_mover(const FullPrintConfig &config, const std::string &gcode)
+    {
+        if (config.fan_speedup_time.value == 0 && config.fan_kickstart.value <= 0)
+            return gcode;
+        return ";_FAN_MOVER_SKIP_START\n" + gcode + ";_FAN_MOVER_SKIP_END\n";
+    }
+
     std::string WipeTowerIntegration::append_tcr(GCode& gcodegen, const WipeTower::ToolChangeResult& tcr, int new_filament_id, double z) const
     {
         if (new_filament_id != -1 && new_filament_id != tcr.new_tool)
@@ -1384,6 +1393,9 @@ static std::vector<Vec2d> get_path_of_change_filament(const Print& print)
             toolchange_gcode_str = gcodegen.placeholder_parser_process("change_filament_gcode", change_filament_gcode, new_filament_id, &config);
 
             check_add_eol(toolchange_gcode_str);
+            // Type1 wipe tower path (every BBL printer): bracket the same way set_extruder() does,
+            // so FanMover doesn't split a G1 inside this custom gcode either.
+            toolchange_gcode_str = wrap_custom_gcode_for_fan_mover(gcodegen.config(), toolchange_gcode_str);
 
             //BBS
             {
@@ -4250,7 +4262,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
             config.set_key_value("nozzle_diameter_at_nozzle_id", new ConfigOptionFloats(get_nozzle_diameters_by_nozzle_id(group_result.get())));
             config.set_key_value("nozzle_volume_types", new ConfigOptionStrings(get_nozzle_volume_types_by_nozzle_id(group_result.get())));
             config.set_key_value("layer_num", new ConfigOptionInt(m_layer_index));
-            std::string filament_start_gcode = this->placeholder_parser_process("filament_start_gcode", print.config().filament_start_gcode.values.at(initial_non_support_extruder_id), initial_non_support_extruder_id,&config);
+            std::string filament_start_gcode = this->placeholder_parser_process("filament_start_gcode", print.config().filament_start_gcode.get_at(initial_non_support_extruder_id), initial_non_support_extruder_id,&config);
             file.writeln(filament_start_gcode);
             // Mark the first filament used in print. Multi-nozzle printers (H2C) get ";VT%d H%d" where
             // H = dynamic ? nozzle_id : -1; existing single-nozzle printers keep the bare ";VT%d" so their
@@ -10895,7 +10907,8 @@ std::string GCode::set_extruder(unsigned int new_filament_id, double print_z, bo
 
         toolchange_gcode_parsed = placeholder_parser_process("change_filament_gcode", change_filament_gcode, new_filament_id, &dyn_config);
         check_add_eol(toolchange_gcode_parsed);
-        gcode += toolchange_gcode_parsed;
+        // toolchange_gcode_parsed is still read below (get_last_z_from_gcode, custom_gcode_changes_tool).
+        gcode += wrap_custom_gcode_for_fan_mover(m_config, toolchange_gcode_parsed);
 
         //BBS
         {

src/libslic3r/GCode/FanMover.cpp

@@ -445,6 +445,11 @@ void FanMover::_process_gcode_line(GCodeReader& reader, const GCodeReader::GCode
                 std::string extrusion_string = line.raw().substr(6, line.raw().size() - 6);
                 current_role = ExtrusionEntity::string_to_role(extrusion_string);
             }
+            if (line.raw().rfind(";_FAN_MOVER_SKIP_", 0) == 0) {
+                // Internal markers: read here, then dropped from the output.
+                m_is_custom_gcode = line.raw().rfind(";_FAN_MOVER_SKIP_START", 0) == 0;
+                time = -1;
+            }
             if (line.raw().size() > 16) {
                 if (line.raw().rfind("; custom gcode", 0) != std::string::npos) {
                     if (line.raw().rfind("; custom gcode end", 0) != std::string::npos)

src/libslic3r/GCode/GCodeProcessor.cpp

@@ -3598,6 +3598,10 @@ void GCodeProcessor::apply_config(const DynamicPrintConfig& config)
     if (has_scarf_joint_seam != nullptr)
         m_detect_layer_based_on_tag = m_detect_layer_based_on_tag || has_scarf_joint_seam->value;
 
+    const ConfigOptionBool* manual_filament_change = config.option<ConfigOptionBool>("manual_filament_change");
+    if (manual_filament_change != nullptr)
+        m_manual_filament_change = manual_filament_change->value;
+
     const ConfigOptionEnumGeneric *bed_type = config.option<ConfigOptionEnumGeneric>("curr_bed_type");
     if (bed_type != nullptr)
         m_result.bed_type = (BedType)bed_type->value;

src/libslic3r/GCode/GCodeProcessor.hpp

@@ -1228,7 +1228,7 @@ inline constexpr float DEFAULT_FILAMENT_DENSITY = 1.245f;
         // m_result.nozzle_group_result, which is handed over only after the stream for the
         // pre-heat injector's second pass and gates the richer change-time model.
         std::shared_ptr<MultiNozzleUtils::NozzleGroupResultBase> m_nozzle_group_result;
-        bool m_manual_filament_change;
+        bool m_manual_filament_change{ false };
 
         //BBS: x, y offset for gcode generated
         double          m_x_offset{ 0 };

src/libslic3r/MeshBoolean.cpp

@@ -29,8 +29,6 @@
 #include <CGAL/Polygon_mesh_processing/triangulate_hole.h>
 #include <CGAL/Polygon_mesh_processing/stitch_borders.h>
 #include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
-#include <CGAL/Polygon_mesh_processing/repair_degeneracies.h>
-#include <CGAL/Polygon_mesh_processing/manifoldness.h>
 #include <cstdint>
 #include <map>
 #include <algorithm>
@@ -50,7 +48,6 @@
 #include <CGAL/Polygon_mesh_processing/orient_polygon_soup.h>
 #include <CGAL/Polygon_mesh_processing/repair.h>
 #include <CGAL/Polygon_mesh_processing/remesh.h>
-#include <CGAL/Polygon_mesh_processing/repair_polygon_soup.h>
 #include <CGAL/Polygon_mesh_processing/orientation.h>
 // BBS: for segment
 #include <CGAL/mesh_segmentation.h>
@@ -658,91 +655,6 @@ bool empty(const CGALMesh &mesh)
     return mesh.m.is_empty();
 }
 
-bool repair(TriangleMesh& mesh, RepairedMeshErrors* repaired_errors, std::string* error)
-{
-    namespace PMP = CGAL::Polygon_mesh_processing;
-
-    if (mesh.empty())
-        return true;
-
-    try {
-        // 1) Convert to polygon soup
-        std::vector<_EpicMesh::Point>         points;
-        std::vector<std::vector<std::size_t>> polygons;
-
-        points.reserve(mesh.its.vertices.size());
-        polygons.reserve(mesh.its.indices.size());
-
-        for (const auto& v : mesh.its.vertices)
-            points.emplace_back(v.x(), v.y(), v.z());
-
-        for (const auto& f : mesh.its.indices)
-            polygons.push_back({size_t(f[0]), size_t(f[1]), size_t(f[2])});
-
-        // 2) Aggressive soup cleanup
-        PMP::repair_polygon_soup(points, polygons);
-
-        // 3) Convert soup → mesh
-        _EpicMesh cgal_mesh;
-        PMP::polygon_soup_to_polygon_mesh(points, polygons, cgal_mesh);
-
-        // 4) Remove degenerate geometry
-        PMP::remove_degenerate_faces(cgal_mesh);
-        PMP::remove_isolated_vertices(cgal_mesh);
-
-        // 5) Fix remaining non-manifold vertices
-        PMP::duplicate_non_manifold_vertices(cgal_mesh);
-
-        // 6) Boolean union (keeps only outer shell)
-        _EpicMesh tmp;
-        if (PMP::corefine_and_compute_union(cgal_mesh, cgal_mesh, tmp)) {
-            cgal_mesh = std::move(tmp);
-        }
-        // If it fails, continue anyway with previous mesh
-
-        // 7) Fill holes
-        if (!CGAL::is_closed(cgal_mesh)) {
-            using halfedge_descriptor = boost::graph_traits<_EpicMesh>::halfedge_descriptor;
-
-            std::vector<halfedge_descriptor> borders;
-            CGAL::extract_boundary_cycles(cgal_mesh, std::back_inserter(borders));
-
-            for (halfedge_descriptor h : borders) {
-                PMP::triangulate_and_refine_hole(cgal_mesh, h);
-            }
-        }
-
-        // 8) Final validity check
-        if (!CGAL::is_closed(cgal_mesh)) {
-            if (error)
-                *error = "Repair failed: mesh still open after hole filling.";
-            return false;
-        }
-
-        // 9) Ensure outward orientation
-        if (!PMP::does_bound_a_volume(cgal_mesh))
-            PMP::orient_to_bound_a_volume(cgal_mesh);
-
-        // 10) Convert back
-        indexed_triangle_set its = cgal_to_indexed_triangle_set(cgal_mesh);
-
-        RepairedMeshErrors errs{};
-        errs.facets_removed = 0;
-        errs.edges_fixed    = 0;
-
-        mesh = TriangleMesh(std::move(its), errs);
-
-        if (repaired_errors)
-            *repaired_errors = errs;
-
-        return true;
-    } catch (const std::exception& e) {
-        if (error)
-            *error = e.what();
-        return false;
-    }
-}
-
 CGALMeshPtr clone(const CGALMesh &m)
 {
     return CGALMeshPtr{new CGALMesh{m}};

src/libslic3r/MeshBoolean.hpp

@@ -77,9 +77,6 @@ TriangleMesh merge(std::vector<TriangleMesh> meshes);
 bool does_bound_a_volume(const CGALMesh &mesh);
 bool empty(const CGALMesh &mesh);
 
-// Repair a mesh using CGAL. Returns true on success. Optionally returns a summary of repairs and an error string.
-bool repair(TriangleMesh &mesh, RepairedMeshErrors *repaired_errors = nullptr, std::string *error = nullptr);
-
 // Real UV unwrap of an open mesh patch via CGAL's LSCM (Least Squares Conformal Maps) surface
 // parameterization. Returns one UV coordinate per input vertex (same indexing as `mesh.vertices`),
 // or nullopt if `mesh` isn't a single topological disk -- LSCM needs exactly one connected

src/libslic3r/MeshRepair.hpp

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <cstddef>
+#include <functional>
+#include <string>
+
+namespace Slic3r {
+
+class TriangleMesh;
+
+struct MeshRepairStats
+{
+    std::size_t welded_vertices    = 0;
+    std::size_t removed_triangles  = 0;
+    std::size_t reversed_shells    = 0;
+    std::size_t filled_holes       = 0;
+    std::size_t removed_shells     = 0;
+    std::size_t self_intersections = 0;
+    // False when the input already was closed, consistently oriented and free of self-intersections.
+    bool        modified           = false;
+};
+
+// Returns false, leaving the mesh untouched, if no solid can be built. progress gets the percentage done and may
+// throw to cancel. See docs/HLSD/mesh-repair.md.
+bool repair_mesh(TriangleMesh &mesh, MeshRepairStats *stats = nullptr, std::string *error = nullptr,
+                 const std::function<void(int)> &progress = {});
+
+} // namespace Slic3r

src/libslic3r/Model.cpp

@@ -29,6 +29,7 @@
 #include "TriangleMeshSlicer.hpp"
 #include "TriangleSelector.hpp"
 #include "MaterialType.hpp"
+#include "MeshRepair.hpp"
 
 #include "Format/AMF.hpp"
 #include "Format/svg.hpp"
@@ -2946,6 +2947,18 @@ size_t ModelVolume::split(unsigned int max_extruders, bool remap_paint)
     if (text_configuration.has_value())
         text_configuration.reset();
 
+    // Parts without a convex hull enclose no volume; drop them here, as deleting volumes later could delete this one.
+    std::vector<std::unique_ptr<ModelVolume>> parts;
+    for (TriangleMesh &mesh : meshes)
+        if (!mesh.empty()) {
+            std::unique_ptr<ModelVolume> part(new ModelVolume(object, *this, std::move(mesh)));
+            if (const std::shared_ptr<const TriangleMesh> &hull = part->get_convex_hull_shared_ptr();
+                hull != nullptr && !hull->its.vertices.empty() && !hull->its.indices.empty())
+                parts.emplace_back(std::move(part));
+        }
+    if (parts.empty())
+        return 1;
+
     std::optional<TriangleSelector::SavedPainting> saved_painting = remap_paint ? save_painting() :
                                                                                   std::optional<TriangleSelector::SavedPainting>{};
 
@@ -2956,26 +2969,22 @@ size_t ModelVolume::split(unsigned int max_extruders, bool remap_paint)
     unsigned int extruder_counter = 0;
     const Vec3d offset = this->get_offset();
 
-    for (TriangleMesh &mesh : meshes) {
-        if (mesh.empty())
-            // Repair may have removed unconnected triangles, thus emptying the mesh.
-            continue;
-
+    for (std::unique_ptr<ModelVolume> &part : parts) {
         if (idx == 0) {
-            this->set_mesh(std::move(mesh));
-            this->calculate_convex_hull();
+            this->set_mesh(part->m_mesh);
+            m_convex_hull = part->m_convex_hull;
             this->invalidate_convex_hull_2d();
             // Assign a new unique ID, so that a new GLVolume will be generated.
             this->set_new_unique_id();
-            // reset the source to disable reload from disk
-            this->source = ModelVolume::Source();
 
             // BBS: reset facet annotations
             this->reset_extra_facets();
         }
         else
-            this->object->volumes.insert(this->object->volumes.begin() + (++ivolume), new ModelVolume(object, *this, std::move(mesh)));
+            this->object->volumes.insert(this->object->volumes.begin() + (++ivolume), part.release());
 
+        // reset the source to disable reload from disk
+        this->object->volumes[ivolume]->source = ModelVolume::Source();
         this->object->volumes[ivolume]->set_offset(Vec3d::Zero());
         this->object->volumes[ivolume]->center_geometry_after_creation();
         this->object->volumes[ivolume]->translate(offset);
@@ -2989,21 +2998,29 @@ size_t ModelVolume::split(unsigned int max_extruders, bool remap_paint)
         ++ idx;
     }
 
-    // discard volumes for which the convex hull was not generated or is degenerate
-    size_t i = 0;
-    while (i < this->object->volumes.size()) {
-        const std::shared_ptr<const TriangleMesh> &hull = this->object->volumes[i]->get_convex_hull_shared_ptr();
-        if (hull == nullptr || hull->its.vertices.empty() || hull->its.indices.empty()) {
-            this->object->delete_volume(i);
-            --idx;
-            --i;
-        }
-        ++i;
-    }
-
     return idx;
 }
 
+bool ModelVolume::repair(bool keep_painting, MeshRepairStats *stats_out, std::string *error, const std::function<void(int)> &progress)
+{
+    TriangleMesh    mesh = this->mesh();
+    MeshRepairStats stats;
+    const bool      ok = repair_mesh(mesh, &stats, error, progress);
+    if (stats_out)
+        *stats_out = stats;
+    if (!ok || !stats.modified)
+        return ok;
+
+    const std::optional<TriangleSelector::SavedPainting> saved_painting = keep_painting ? save_painting() : std::nullopt;
+    this->set_mesh(std::move(mesh));
+    this->calculate_convex_hull();
+    this->invalidate_convex_hull_2d();
+    // Assign a new unique ID, so that a new GLVolume will be generated.
+    this->set_new_unique_id();
+    this->restore_painting(saved_painting);
+    return true;
+}
+
 void ModelVolume::translate(const Vec3d& displacement)
 {
     set_offset(get_offset() + displacement);

src/libslic3r/Model.hpp

@@ -77,6 +77,7 @@ class Preset;
 class BBLProject;
 
 class KeyStore;
+struct MeshRepairStats;
 
 namespace UndoRedo {
 	class StackImpl;
@@ -887,13 +888,13 @@ public:
     // The triangular model.
     const TriangleMesh& mesh() const { return *m_mesh.get(); }
     std::shared_ptr<const TriangleMesh> mesh_ptr() const { return m_mesh; }
-    void                set_mesh(const TriangleMesh &mesh) { m_mesh = std::make_shared<const TriangleMesh>(mesh); }
-    void                set_mesh(TriangleMesh &&mesh) { m_mesh = std::make_shared<const TriangleMesh>(std::move(mesh)); }
-    void                set_mesh(const indexed_triangle_set &mesh) { m_mesh = std::make_shared<const TriangleMesh>(mesh); }
-    void                set_mesh(indexed_triangle_set &&mesh) { m_mesh = std::make_shared<const TriangleMesh>(std::move(mesh)); }
-    void                set_mesh(std::shared_ptr<const TriangleMesh> &mesh) { m_mesh = mesh; }
-    void                set_mesh(std::unique_ptr<const TriangleMesh> &&mesh) { m_mesh = std::move(mesh); }
-	void				reset_mesh() { m_mesh = std::make_shared<const TriangleMesh>(); }
+    void                set_mesh(const TriangleMesh &mesh) { m_mesh = std::make_shared<const TriangleMesh>(mesh); m_is_splittable = -1; }
+    void                set_mesh(TriangleMesh &&mesh) { m_mesh = std::make_shared<const TriangleMesh>(std::move(mesh)); m_is_splittable = -1; }
+    void                set_mesh(const indexed_triangle_set &mesh) { m_mesh = std::make_shared<const TriangleMesh>(mesh); m_is_splittable = -1; }
+    void                set_mesh(indexed_triangle_set &&mesh) { m_mesh = std::make_shared<const TriangleMesh>(std::move(mesh)); m_is_splittable = -1; }
+    void                set_mesh(std::shared_ptr<const TriangleMesh> &mesh) { m_mesh = mesh; m_is_splittable = -1; }
+    void                set_mesh(std::unique_ptr<const TriangleMesh> &&mesh) { m_mesh = std::move(mesh); m_is_splittable = -1; }
+	void				reset_mesh() { m_mesh = std::make_shared<const TriangleMesh>(); m_is_splittable = -1; }
     const std::shared_ptr<const TriangleMesh>& get_mesh_shared_ptr() const { return m_mesh; }
     // Configuration parameters specific to an object model geometry or a modifier volume, 
     // overriding the global Slic3r settings and the ModelObject settings.
@@ -1043,6 +1044,9 @@ public:
     // Return the number of volumes created from this one.
     // This is useful to assign different materials to different volumes of an object.
     size_t              split(unsigned int max_extruders, bool remap_paint);
+    // Replaces the mesh by its repair_mesh() result if that changed it. False if no solid can be built.
+    bool                repair(bool keep_painting, MeshRepairStats *stats = nullptr, std::string *error = nullptr,
+                               const std::function<void(int)> &progress = {});
     void                translate(double x, double y, double z) { translate(Vec3d(x, y, z)); }
     void                translate(const Vec3d& displacement);
     void                scale(const Vec3d& scaling_factors);

src/libslic3r/Preset.cpp

@@ -81,7 +81,6 @@
 #include "LifecycleEvents.hpp"
 #include "Utils.hpp"
 #include "InstanceLock.hpp"
-#include "nlohmann/json.hpp"
 
 #include <sstream>
 #include "PlaceholderParser.hpp"
@@ -2729,95 +2728,6 @@ void PresetCollection::update_after_user_presets_loaded()
     return;
 }
 
-const Preset *PresetCollection::system_parent_with_inherited_printers(const Preset &preset) const
-{
-    if (!preset.is_user() || preset.inherits().empty())
-        return nullptr;
-    const Preset *parent = get_preset_parent(preset);
-    if (parent == nullptr || !parent->is_system)
-        return nullptr;
-    // A user preset that sets its own compatible_printers keeps exactly those.
-    const auto *own       = preset.config.option<ConfigOptionStrings>("compatible_printers");
-    const auto *inherited = parent->config.option<ConfigOptionStrings>("compatible_printers");
-    return own != nullptr && inherited != nullptr && own->values == inherited->values ? parent : nullptr;
-}
-
-std::vector<LegacyPrinterMigration> PresetCollection::legacy_printer_migrations(const std::map<std::string, std::vector<std::string>> &printers_by_parent) const
-{
-    std::vector<LegacyPrinterMigration> migrations;
-    for (const Preset &preset : m_presets) {
-        const Preset *parent = system_parent_with_inherited_printers(preset);
-        if (parent == nullptr)
-            continue;
-        // An empty list already covers every printer.
-        const std::vector<std::string> &own = preset.config.option<ConfigOptionStrings>("compatible_printers")->values;
-        if (own.empty())
-            continue;
-        // The map names the parent as it was when the map was written; a later rename keeps that name in renamed_from.
-        auto it = printers_by_parent.find(parent->name);
-        for (auto old_name = parent->renamed_from.begin(); it == printers_by_parent.end() && old_name != parent->renamed_from.end(); ++old_name)
-            it = printers_by_parent.find(*old_name);
-        if (it == printers_by_parent.end())
-            continue;
-        LegacyPrinterMigration migration{preset.name, parent->name, {}};
-        for (const std::string &printer : it->second)
-            if (std::find(own.begin(), own.end(), printer) == own.end())
-                migration.printers.push_back(printer);
-        if (!migration.printers.empty())
-            migrations.push_back(std::move(migration));
-    }
-    return migrations;
-}
-
-bool PresetCollection::apply_legacy_printer_migration(const LegacyPrinterMigration &migration)
-{
-    lock();
-    auto it = this->find_preset_internal(migration.preset);
-    if (it == m_presets.end() || it->name != migration.preset || system_parent_with_inherited_printers(*it) == nullptr) {
-        unlock();
-        return false;
-    }
-    Preset                  &preset   = *it;
-    std::vector<std::string> printers = preset.config.option<ConfigOptionStrings>("compatible_printers")->values;
-    for (const std::string &printer : migration.printers)
-        if (std::find(printers.begin(), printers.end(), printer) == printers.end())
-            printers.push_back(printer);
-    const bool selected = m_idx_selected == static_cast<size_t>(it - m_presets.begin());
-    unlock();
-
-    // Only compatible_printers changes in the file. Saving the whole preset would also rewrite an inherits that
-    // names a renamed parent by its old name, the only name older releases know it by.
-    {
-        InstanceLock instance_lock(user_presets_lock_path());
-        try {
-            boost::nowide::ifstream in(preset.file);
-            json                    j = json::parse(in);
-            j["compatible_printers"]  = printers;
-            if (const std::error_code ec = write_file_atomically(preset.file, j.dump(1, '\t'))) {
-                BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": failed to save " << preset.file << ": " << ec.message();
-                return false;
-            }
-        } catch (const std::exception &err) {
-            BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": can not migrate " << preset.file << ": " << err.what();
-            return false;
-        }
-    }
-
-    lock();
-    preset.config.option<ConfigOptionStrings>("compatible_printers")->values = printers;
-    if (selected)
-        m_edited_preset.config.option<ConfigOptionStrings>("compatible_printers", true)->values = printers;
-    unlock();
-    // Push the change to the cloud copy, as an edit in the settings tab would.
-    if (!preset.setting_id.empty()) {
-        preset.sync_info = "update";
-        preset.save_info();
-    }
-    BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": user preset " << preset.name << " gets " << migration.printers.size()
-                            << " printer(s) its parent listed in an older release";
-    return true;
-}
-
 //BBS: validate_preset
 bool PresetCollection::validate_preset(const std::string &preset_name, std::string &inherit_name)
 {

src/libslic3r/Preset.hpp

@@ -551,14 +551,6 @@ struct PresetConfigSubstitutions {
 // PrusaSlicer and reading the user Print / Filament / Printer profiles.
 using PresetsConfigSubstitutions = std::vector<PresetConfigSubstitutions>;
 
-// A user filament preset that no longer shows on printers its system parent listed in an older release,
-// and those printers. Migrating it writes them into the preset's own compatible_printers.
-struct LegacyPrinterMigration {
-    std::string              preset;
-    std::string              parent;
-    std::vector<std::string> printers;
-};
-
 // Collections of presets of the same type (one of the Print, Filament or Printer type).
 class PresetCollection
 {
@@ -609,14 +601,6 @@ public:
     void            save_user_presets(const std::string& dir_path, const std::string& type, std::map<std::string, std::string>& need_to_delete_list);
     bool            load_user_preset(std::string name, std::map<std::string, std::string> preset_values, PresetsConfigSubstitutions& substitutions, ForwardCompatibilitySubstitutionRule rule, const PresetOrigin &load_origin = PresetOrigin(PresetOrigin::Kind::User));
     void            update_after_user_presets_loaded();
-    // User presets store only their diff, so a user preset inherits its system parent's compatible_printers
-    // and disappears from a printer once a profile update narrows that list. Lists the user presets that
-    // inherit the list and the printers their parent covered in an older release (printers_by_parent, keyed
-    // by the parent's name then) but no longer lists.
-    std::vector<LegacyPrinterMigration> legacy_printer_migrations(const std::map<std::string, std::vector<std::string>> &printers_by_parent) const;
-    // Adds the migration's printers to the preset's own compatible_printers and saves the preset to disk.
-    // False if the preset no longer inherits its parent's list or could not be saved.
-    bool            apply_legacy_printer_migration(const LegacyPrinterMigration &migration);
     //BBS: get user presets
     int  get_user_presets(PresetBundle *preset_bundle, std::vector<Preset> &result_presets);
     void set_sync_info_and_save(std::string name, std::string setting_id, std::string syncinfo, long long update_time, const std::string& user_id);
@@ -909,10 +893,6 @@ public:
     size_t num_default_presets() { return m_num_default_presets; }
 
 protected:
-    // The system parent of a user preset whose compatible_printers is the parent's, or nullptr: the presets
-    // legacy_printer_migrations() considers.
-    const Preset*   system_parent_with_inherited_printers(const Preset &preset) const;
-
     PresetCollection() = default;
     // Deleted by the std::recursive_mutex member. PresetBundle copies by assignment.
     PresetCollection(const PresetCollection &other) = delete;

src/libslic3r/PresetBundle.cpp

@@ -2,7 +2,6 @@
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/directory.hpp>
-#include <boost/filesystem/file_status.hpp>
 #include <boost/uuid/uuid.hpp>
 #include <boost/optional/optional.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -25,7 +24,6 @@
 #include <memory>
 #include <initializer_list>
 #include <map>
-#include <mutex>
 #include <iterator>
 #include <functional>
 #include <limits>
@@ -40,8 +38,6 @@
 #include "ParallelResolve.hpp"
 #include "Preset.hpp"
 #include "PresetCacheFormat.hpp"
-#include "Time.hpp"
-#include "Zipper.hpp"
 #include "PrintConfig.hpp"
 #include "PublishSettings.hpp"
 #include "FilamentMixer.hpp"
@@ -100,34 +96,6 @@ using json = nlohmann::json;
 
 namespace Slic3r {
 
-// Per current system filament preset, the printers it listed in an older release and no longer does
-// (resources/info/legacy_compatible_printers.json, written by orca_profile_tool.py legacy-compat).
-// The file ships with the build, so it is read once it opens; until then (e.g. presets loaded before
-// resources_dir() is set) every call tries again and there are no legacy printers.
-static std::map<std::string, std::vector<std::string>> legacy_compatible_printers()
-{
-    static std::mutex                                      mutex;
-    static std::map<std::string, std::vector<std::string>> printers_by_parent;
-    static bool                                            read = false;
-
-    std::lock_guard<std::mutex> guard(mutex);
-    if (!read) {
-        const fs::path path = fs::path(resources_dir()) / "info" / "legacy_compatible_printers.json";
-        boost::nowide::ifstream in(path.string());
-        if (!in) {
-            BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ": " << path.string() << " not found";
-            return {};
-        }
-        read = true;
-        try {
-            printers_by_parent = json::parse(in).at("presets").get<std::map<std::string, std::vector<std::string>>>();
-        } catch (const std::exception &err) {
-            BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": can not read " << path.string() << ": " << err.what();
-        }
-    }
-    return printers_by_parent;
-}
-
 // Project-level options imported from a loaded 3MF into project_config. s_project_options_published
 // below is the reduced subset that crosses over in "published" 3MF mode; keep both in sync.
 // s_project_options_published additionally carries wipe_tower_rotation_angle, which normal
@@ -1077,55 +1045,6 @@ bool PresetBundle::backup_user_folder() const
     }
 }
 
-bool PresetBundle::backup_user_folder_to_zip(const std::string &zip_path) const
-{
-    const fs::path user_dir = fs::path(data_dir()) / PRESET_USER_DIR;
-    BOOST_LOG_TRIVIAL(info) << "Backing up user folder to: " << zip_path;
-    try {
-        Zipper zipper(zip_path);
-        // Directories get their own entries, which extract_archive_confined() needs to recreate them.
-        zipper.add_entry(std::string(PRESET_USER_DIR) + "/", nullptr, 0);
-        for (const fs::directory_entry &entry : fs::recursive_directory_iterator(user_dir)) {
-            const std::string name = (fs::path(PRESET_USER_DIR) / entry.path().lexically_relative(user_dir)).generic_string();
-            if (fs::is_directory(entry.status())) {
-                zipper.add_entry(name + "/", nullptr, 0);
-                continue;
-            }
-            if (!fs::is_regular_file(entry.status()))
-                continue;
-            boost::nowide::ifstream in(entry.path().string(), std::ios::binary);
-            const std::string data((std::istreambuf_iterator<char>(in)), std::istreambuf_iterator<char>());
-            if (!in.good() && !in.eof())
-                throw Slic3r::RuntimeError("can not read " + entry.path().string());
-            zipper.add_entry(name, data.data(), data.size());
-        }
-        zipper.finalize();
-        return true;
-    } catch (const std::exception &ex) {
-        BOOST_LOG_TRIVIAL(error) << "Exception during user folder backup: " << ex.what();
-        boost::system::error_code ec;
-        fs::remove(zip_path, ec);
-        return false;
-    }
-}
-
-std::vector<LegacyPrinterMigration> PresetBundle::legacy_printer_migrations() const
-{
-    return filaments.legacy_printer_migrations(legacy_compatible_printers());
-}
-
-std::string PresetBundle::migrate_legacy_printers(const std::vector<LegacyPrinterMigration> &migrations, std::vector<std::string> &failed)
-{
-    const std::string zip_path = data_dir() + "/filament_preset_migration_" +
-                                 Utils::time2str(Utils::TimeZone::utc, Utils::TimeFormat::iso8601Z) + "_backup.zip";
-    if (!backup_user_folder_to_zip(zip_path))
-        return {};
-    for (const LegacyPrinterMigration &migration : migrations)
-        if (!filaments.apply_legacy_printer_migration(migration))
-            failed.push_back(migration.preset);
-    return zip_path;
-}
-
 std::optional<FilamentBaseInfo> PresetBundle::get_filament_by_filament_id(const std::string& filament_id, const std::string& printer_name) const
 {
     if (filament_id.empty())

src/libslic3r/PresetBundle.hpp

@@ -376,16 +376,6 @@ public:
     bool use_bbl_device_tab();
 
     bool backup_user_folder() const;
-    // Writes the user preset folder into a zip archive at zip_path, its entries under "user/".
-    bool backup_user_folder_to_zip(const std::string &zip_path) const;
-
-    // User filament presets that no longer show on printers their parent listed in an older release
-    // (resources/info/legacy_compatible_printers.json).
-    std::vector<LegacyPrinterMigration> legacy_printer_migrations() const;
-    // Backs up the user preset folder into a zip in data_dir(), then writes each migration's printers into its
-    // preset file. Returns the zip's path, or an empty string when the backup failed and nothing was migrated.
-    // The presets that could not be migrated are added to failed.
-    std::string migrate_legacy_printers(const std::vector<LegacyPrinterMigration> &migrations, std::vector<std::string> &failed);
 
     //BBS: project embedded preset logic
     PresetsConfigSubstitutions load_project_embedded_presets(std::vector<Preset*> project_presets, ForwardCompatibilitySubstitutionRule substitution_rule);

src/libslic3r/Print.cpp

@@ -2991,6 +2991,15 @@ void  PrintObject::clear_shared_object()
 void  PrintObject::copy_layers_from_shared_object()
 {
     if (m_shared_object) {
+        // Orca: Print::process() calls this once per slice for each sharing object, after clear_shared_object() has
+        // emptied any earlier alias, so the vectors hold only layers this object sliced itself before it started sharing
+        // (or nothing). Free them here, as clear_support_layers() / clear_layers() would; those skip deletion while
+        // m_shared_object is set. The belt-only data they also free is always empty here, because belt printers never
+        // share layers.
+        for (SupportLayer *layer : m_support_layers)
+            delete layer;
+        for (Layer *layer : m_layers)
+            delete layer;
         m_layers.clear();
         m_support_layers.clear();
 

src/libslic3r/PrintConfig.cpp

@@ -12866,10 +12866,11 @@ CLITransformConfigDef::CLITransformConfigDef()
     //def->cli = "orient|o";
     def->set_default_value(new ConfigOptionInt(0));
 
-    /*def = this->add("repair", coBool);
+    def = this->add("repair", coBool);
     def->label = L("Repair");
-    def->tooltip = L("Repair the model's meshes if it is non-manifold mesh.");
-    def->set_default_value(new ConfigOptionBool(false));*/
+    def->tooltip = L("Repair the meshes of the models as Fix Model does: close holes and cracks, orient them outward and "
+                     "remove self-intersections.");
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("rotate", coFloat);
     def->label = L("Rotate");
@@ -13085,7 +13086,7 @@ CLIMiscConfigDef::CLIMiscConfigDef()
     def = this->add("allow_rotations", coBool);
     def->label = L("Allow rotation when arranging");
     def->tooltip = L("If enabled, Arrange will allow rotation when placing objects.");
-    def->set_default_value(new ConfigOptionBool(true));
+    def->set_default_value(new ConfigOptionBool(false));
 
     def = this->add("align_to_y_axis", coBool);
     def->label = L("Align to Y axis when arranging");

src/libslic3r/PrintObject.cpp

@@ -982,6 +982,9 @@ void PrintObject::generate_support_material(bool with_belt_brim)
             this->_generate_support_material();
             m_print->throw_if_canceled();
         }
+        // Orca: the tree support collision/avoidance caches and support nodes are only used while this step runs
+        // (detect_overhangs() rebuilds them from scratch), so don't keep them resident until the next slice.
+        this->clear_tree_support_preview_cache();
         // Belt brim rides here rather than in the brim step because its apron
         // prologue introduces print_z values below the object's first layer, and
         // those must exist before ToolOrdering is built at psWipeTower - one step

src/libslic3r/PrintObjectSlice.cpp

@@ -1532,7 +1532,7 @@ void PrintObject::slice_volumes()
                         if (min_growth < 0.f || elfoot > 0.f) {
                             // Apply the negative XY compensation. (the ones that is <0)
                             ExPolygons trimming;
-                            static const float eps = float(scale_(m_config.slice_closing_radius.value) * 1.5);
+                            const float eps = float(scale_(m_config.slice_closing_radius.value) * 1.5);
                             if (elfoot > 0.f) {
                                 ExPolygons expolygons_to_compensate = offset_ex(layer->merged(eps), -eps);
                                 lslices_elfoot_uncompensated[layer_id] = expolygons_to_compensate;

src/libslic3r/Support/TreeSupport.cpp

@@ -1976,37 +1976,15 @@ coordf_t TreeSupport::get_radius(const SupportNode* node)
     return node->radius;
 }
 
-ExPolygons TreeSupport::get_avoidance(coordf_t radius, size_t obj_layer_nr)
+// Orca: drop_nodes() calls these several times per node per layer, so they return a reference into the
+// TreeSupportData cache. The cache only ever inserts, so its entries never move while nodes drop in parallel.
+const ExPolygons& TreeSupport::get_avoidance(coordf_t radius, size_t obj_layer_nr)
 {
-#if USE_SUPPORT_3D
-    if (m_model_volumes) {
-        bool on_build_plate = m_object_config->support_on_build_plate_only.value;
-        const Polygons& avoid_polys = m_model_volumes->getAvoidance(radius, obj_layer_nr, TreeSupport3D::TreeModelVolumes::AvoidanceType::FastSafe, on_build_plate, true);
-        ExPolygons expolys;
-        for (auto& poly : avoid_polys)
-            expolys.emplace_back(std::move(poly));
-        return expolys;
-    }
-    return ExPolygons();
-#else
     return m_ts_data->get_avoidance(radius, obj_layer_nr);
-#endif
 }
-ExPolygons TreeSupport::get_collision(coordf_t radius, size_t layer_nr)
+const ExPolygons& TreeSupport::get_collision(coordf_t radius, size_t layer_nr)
 {
-#if USE_SUPPORT_3D
-    if (m_model_volumes) {
-        bool on_build_plate = m_object_config->support_on_build_plate_only.value;
-        const Polygons& collision_polys = m_model_volumes->getCollision(radius, layer_nr, true);
-        ExPolygons expolys;
-        for (auto& poly : collision_polys)
-            expolys.emplace_back(std::move(poly));
-        return expolys;
-    }
-#else
     return m_ts_data->get_collision(radius, layer_nr);
-#endif
-    return ExPolygons();
 }
 Polygons TreeSupport::get_collision_polys(coordf_t radius, size_t layer_nr)
 {
@@ -2827,7 +2805,12 @@ void TreeSupport::draw_circles()
 #endif  // SUPPORT_TREE_DEBUG_TO_SVG
 
     SupportLayerPtrs& ts_layers = m_object->support_layers();
-    auto iter = std::remove_if(ts_layers.begin(), ts_layers.end(), [](SupportLayer* ts_layer) { return ts_layer->height < EPSILON; });
+    // Orca: the vector owns its layers, so the dropped ones are deleted before they are erased.
+    // std::stable_partition (unlike std::remove_if) leaves exactly the dropped layers in the tail.
+    // Only heights below EPSILON are dropped; written as !(height < EPSILON), a NaN height is kept.
+    auto iter = std::stable_partition(ts_layers.begin(), ts_layers.end(), [](SupportLayer* ts_layer) { return !(ts_layer->height < EPSILON); });
+    for (auto it = iter; it != ts_layers.end(); ++it)
+        delete *it;
     ts_layers.erase(iter, ts_layers.end());
     for (int layer_nr = 0; layer_nr < ts_layers.size(); layer_nr++) {
         ts_layers[layer_nr]->upper_layer = layer_nr != ts_layers.size() - 1 ? ts_layers[layer_nr + 1] : nullptr;
@@ -3071,7 +3054,7 @@ void TreeSupport::drop_nodes()
                     //Insert a completely new node and let both original nodes fade.
                     Point next_position = (node.position + neighbours[0]) / 2; //Average position of the two nodes.
                     coordf_t next_radius = calc_radius(node.dist_mm_to_top+height_next);
-                    auto avoid_layer = get_avoidance(next_radius, obj_layer_nr_next);
+                    const ExPolygons& avoid_layer = get_avoidance(next_radius, obj_layer_nr_next);
                     if (group_index == 0)
                     {
                         //Avoid collisions.
@@ -3275,7 +3258,7 @@ void TreeSupport::drop_nodes()
                 }
 #endif
                 coordf_t next_radius = calc_radius(node.dist_mm_to_top + height_next);
-                auto avoidance_next = get_avoidance(next_radius, obj_layer_nr_next);
+                const ExPolygons& avoidance_next = get_avoidance(next_radius, obj_layer_nr_next);
 
                 Point  to_outside         = projection_onto(avoidance_next, node.position);
                 Point  direction_to_outer = to_outside - node.position;
@@ -3337,7 +3320,7 @@ void TreeSupport::drop_nodes()
                     p_node->to_buildplate = false;
                     return; // from parallel_for_each lambda
                 }
-                auto              next_collision = get_collision(0, obj_layer_nr_next);
+                const ExPolygons& next_collision = get_collision(0, obj_layer_nr_next);
                 const bool   to_buildplate  = !is_inside_ex(m_ts_data->m_layer_outlines[obj_layer_nr_next], next_layer_vertex);
                 // don't increase radius if next node will collide partially with the object (STUDIO-7883)
                 to_outside             = projection_onto(next_collision, next_layer_vertex);

src/libslic3r/Support/TreeSupport.hpp

@@ -536,9 +536,9 @@ private:
     coordf_t calc_branch_radius(coordf_t base_radius, coordf_t mm_to_top, double diameter_angle_scale_factor, bool use_min_distance=true);
     coordf_t   calc_radius(coordf_t mm_to_top);
     coordf_t get_radius(const SupportNode* node);
-    ExPolygons get_avoidance(coordf_t radius, size_t obj_layer_nr);
+    const ExPolygons& get_avoidance(coordf_t radius, size_t obj_layer_nr);
     // layer's expolygon expanded by radius+m_xy_distance
-    ExPolygons get_collision(coordf_t radius, size_t layer_nr);
+    const ExPolygons& get_collision(coordf_t radius, size_t layer_nr);
     // get Polygons instead of ExPolygons
     Polygons get_collision_polys(coordf_t radius, size_t layer_nr);
 

src/libslic3r/TextureToColor/TextureToColor.cpp

@@ -673,14 +673,14 @@ static bool repair_cluster_smooth(
                     [&]() { return cancelled(); }, &repair_error);
                 if (repaired) {
                     if (cancelled()) return false;
-                    BOOST_LOG_TRIVIAL(info) << log_prefix << ": Windows 3D mesh repair finished.";
+                    BOOST_LOG_TRIVIAL(info) << log_prefix << ": mesh repair finished.";
                     if (!resample_face_colors(TriMesh(std::move(repaired_its))))
                         return false;
                 } else {
-                    BOOST_LOG_TRIVIAL(warning) << log_prefix << ": Windows 3D mesh repair failed: " << repair_error;
+                    BOOST_LOG_TRIVIAL(warning) << log_prefix << ": mesh repair failed: " << repair_error;
                 }
             } else {
-                BOOST_LOG_TRIVIAL(info) << log_prefix << ": importing mesh without Windows 3D repair.";
+                BOOST_LOG_TRIVIAL(info) << log_prefix << ": importing mesh without repair.";
             }
         }
     }

src/libvgcode/src/SegmentTemplate.cpp

@@ -21,7 +21,9 @@ namespace libvgcode {
 // the triangles that share it: the shader runs 8 times per segment instead of 24.
 static constexpr const std::array<uint8_t, 8> VERTEX_DATA = { 0, 1, 2, 3, 4, 5, 6, 7 };
 
-static constexpr const std::array<uint8_t, 24> INDEX_DATA = {
+// 16-bit indices: GCN 1/2 GPUs have no 8-bit index support, and some of their drivers
+// emulate it wrongly in instanced draws.
+static constexpr const std::array<uint16_t, 24> INDEX_DATA = {
     0, 1, 2, // front spike
     0, 2, 3, // front spike
     0, 3, 4, // right/bottom body 
@@ -37,7 +39,7 @@ void SegmentTemplate::init()
     if (m_vao_id != 0)
         return;
 
-    m_size_in_bytes_gpu += (VERTEX_DATA.size() + INDEX_DATA.size()) * sizeof(uint8_t);
+    m_size_in_bytes_gpu += VERTEX_DATA.size() * sizeof(uint8_t) + INDEX_DATA.size() * sizeof(uint16_t);
 
     int curr_vertex_array;
     glsafe(glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &curr_vertex_array));
@@ -61,7 +63,7 @@ void SegmentTemplate::init()
     // and restored together with the vao.
     glsafe(glGenBuffers(1, &m_ibo_id));
     glsafe(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_ibo_id));
-    glsafe(glBufferData(GL_ELEMENT_ARRAY_BUFFER, INDEX_DATA.size() * sizeof(uint8_t), INDEX_DATA.data(), GL_STATIC_DRAW));
+    glsafe(glBufferData(GL_ELEMENT_ARRAY_BUFFER, INDEX_DATA.size() * sizeof(uint16_t), INDEX_DATA.data(), GL_STATIC_DRAW));
 
     glsafe(glBindBuffer(GL_ARRAY_BUFFER, curr_array_buffer));
     glsafe(glBindVertexArray(curr_vertex_array));
@@ -94,7 +96,7 @@ void SegmentTemplate::render(size_t count)
     glsafe(glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &curr_vertex_array));
 
     glsafe(glBindVertexArray(m_vao_id));
-    glsafe(glDrawElementsInstanced(GL_TRIANGLES, static_cast<GLsizei>(INDEX_DATA.size()), GL_UNSIGNED_BYTE,
+    glsafe(glDrawElementsInstanced(GL_TRIANGLES, static_cast<GLsizei>(INDEX_DATA.size()), GL_UNSIGNED_SHORT,
                                    nullptr, static_cast<GLsizei>(count)));
     glsafe(glBindVertexArray(curr_vertex_array));
 }

src/slic3r/CMakeLists.txt

@@ -362,8 +362,6 @@ set(SLIC3R_GUI_SOURCES
     GUI/Lazy.hpp
     GUI/LazyPage.cpp
     GUI/LazyPage.hpp
-    GUI/LegacyPrinterMigrationDialog.cpp
-    GUI/LegacyPrinterMigrationDialog.hpp
     GUI/LibVGCode/LibVGCodeWrapper.hpp
     GUI/LibVGCode/LibVGCodeWrapper.cpp
     GUI/LinuxDisplayBackend.cpp

src/slic3r/GUI/ConfigManipulation.cpp

@@ -1105,6 +1105,10 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, in
     toggle_field("support_filament", have_support_material || have_skirt);
 
     toggle_line("raft_contact_distance", have_raft && !have_support_soluble);
+    // Orca:Hide raft expansion when raft is not enabled
+    toggle_line("raft_expansion", have_raft);
+    // Orca: Slim, Strong and Hybrid tree supports size their raft by first layer expansion only.
+    toggle_field("raft_expansion", !(is_tree(support_type) && (support_style == smsTreeSlim || support_style == smsTreeStrong || support_style == smsTreeHybrid)));
 
     // Orca: First-layer density is available for supports broadly.
     toggle_field("raft_first_layer_density", have_support_material);

src/slic3r/GUI/GLTexture.cpp

@@ -719,9 +719,6 @@ void GLTexture::render_sub_texture(unsigned int tex_id, float left, float right,
     // does not treat anti-aliased icon edges as window transparency.
     glsafe(::glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA));
 
-    glsafe(::glEnable(GL_TEXTURE_2D));
-    glsafe(::glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE));
-
     glsafe(::glBindTexture(GL_TEXTURE_2D, (GLuint)tex_id));
 
     GLModel::Geometry init_data;
@@ -753,7 +750,6 @@ void GLTexture::render_sub_texture(unsigned int tex_id, float left, float right,
 
     glsafe(::glBindTexture(GL_TEXTURE_2D, 0));
 
-    glsafe(::glDisable(GL_TEXTURE_2D));
     glsafe(::glDisable(GL_BLEND));
 }
 

src/slic3r/GUI/GUI_App.cpp

@@ -12,7 +12,6 @@
 #include "DeviceManager.hpp"
 #include "HMS.hpp"
 #include "PresetBundleDialog.hpp"
-#include "LegacyPrinterMigrationDialog.hpp"
 #include "WebUserLoginDialog.hpp"
 #include "WebViewDialog.hpp"
 #include "slic3r/Utils/BBLCloudServiceAgent.hpp"
@@ -1110,8 +1109,6 @@ void GUI_App::post_init()
             }
 
             this->check_new_version_sf();
-            if (!cw_showed)
-                this->check_legacy_printer_migration(false);
             const auto cloud_provider = get_printer_cloud_provider();
             if (is_user_login(cloud_provider) && !app_config->get_stealth_mode()) {
               // this->check_privacy_version(0);
@@ -6819,50 +6816,6 @@ void GUI_App::reload_settings()
     }
 }
 
-void GUI_App::check_legacy_printer_migration(bool by_user)
-{
-    const std::vector<LegacyPrinterMigration> migrations = preset_bundle->legacy_printer_migrations();
-    if (migrations.empty()) {
-        if (by_user)
-            MessageDialog(mainframe, _L("All your filament presets are available on the printers they were made for."),
-                          _L("Migrate Filament Presets"), wxOK | wxICON_INFORMATION).ShowModal();
-        return;
-    }
-    if (!by_user && app_config->get_bool("legacy_printer_migration_dont_remind"))
-        return;
-
-    LegacyPrinterMigrationDialog dlg(mainframe, migrations, !by_user);
-    const bool migrate = dlg.ShowModal() == wxID_YES;
-    if (dlg.dont_remind())
-        app_config->set_bool("legacy_printer_migration_dont_remind", true);
-    if (!migrate)
-        return;
-
-    std::vector<std::string> failed;
-    const std::string backup = preset_bundle->migrate_legacy_printers(migrations, failed);
-    if (backup.empty()) {
-        show_error(mainframe, _L("Your presets could not be backed up, so they were not migrated."));
-        return;
-    }
-    preset_bundle->update_compatible(PresetSelectCompatibleType::Never);
-    mainframe->update_side_preset_ui();
-    for (auto tab : tabs_list) {
-        tab->reload_config();
-        tab->update_changed_ui();
-    }
-    if (plater_)
-        plater_->sidebar().update_all_preset_comboboxes();
-
-    wxString message = format_wxstr(_L("Your filament presets were migrated. Select them again in the filament list where you used them.\n\n"
-                                        "A backup of your presets was saved to:\n%1%"), backup);
-    if (!failed.empty()) {
-        message += "\n\n" + _L("These presets could not be migrated:");
-        for (const std::string &name : failed)
-            message += "\n" + from_u8(name);
-    }
-    MessageDialog(mainframe, message, _L("Migrate Filament Presets"), wxOK | (failed.empty() ? wxICON_INFORMATION : wxICON_WARNING)).ShowModal();
-}
-
 //BBS reload when logout
 void GUI_App::remove_user_presets()
 {

src/slic3r/GUI/GUI_App.hpp

@@ -567,10 +567,6 @@ public:
     void            check_update(bool show_tips, int by_user);
     void            check_new_version(bool show_tips = false, int by_user = 0);
     void            check_new_version_sf(bool show_tips = false, int by_user = 0);
-    // Offers to migrate user filament presets that lost printers their parent listed in an older release.
-    // At startup it asks once per release unless the user chose not to be reminded; by_user also reports
-    // when there is nothing to migrate.
-    void            check_legacy_printer_migration(bool by_user);
     bool            process_network_msg(std::string dev_id, std::string msg);
     void            request_new_version(int by_user);
     void            enter_force_upgrade();

src/slic3r/GUI/GUI_Factories.cpp

@@ -1952,6 +1952,16 @@ void MenuFactory::create_plate_menu()
         },
         "", nullptr, []() { return !plater()->get_partplate_list().get_selected_plate()->get_objects().empty(); }, m_parent);
 
+    // fix objects on current plate
+    append_menu_item(menu, wxID_ANY, _L("Fix All"), _L("Fix all models on the current plate"),
+        [](wxCommandEvent&) { obj_list()->fix_all_through_cgal(false); }, "", nullptr,
+        []() { return !plater()->get_partplate_list().get_selected_plate()->empty(); }, m_parent);
+
+    // fix objects on all plates
+    append_menu_item(menu, wxID_ANY, _L("Fix All Plates"), _L("Fix all models on all plates"),
+        [](wxCommandEvent&) { obj_list()->fix_all_through_cgal(true); }, "", nullptr,
+        []() { return !plater()->model().objects.empty(); }, m_parent);
+
     // orient objects on current plate
     append_menu_item(menu, wxID_ANY, _L("Auto Rotate"), _L("Auto rotate current plate"),
         [](wxCommandEvent&) {

src/slic3r/GUI/GUI_ObjectList.cpp

@@ -6297,30 +6297,44 @@ void ObjectList::rename_item()
 }
 
 void ObjectList::fix_through_cgal()
+{
+    std::vector<int> obj_idxs, vol_idxs;
+    get_selection_indexes(obj_idxs, vol_idxs);
+    fix_through_cgal(obj_idxs, vol_idxs);
+}
+
+void ObjectList::fix_all_through_cgal(bool all_plates)
+{
+    std::vector<int> obj_idxs;
+    if (all_plates) {
+        for (int obj_idx = 0; obj_idx < int(m_objects->size()); ++obj_idx)
+            obj_idxs.push_back(obj_idx);
+    } else {
+        for (const ModelObject *mo : wxGetApp().plater()->get_partplate_list().get_selected_plate()->get_objects_on_this_plate())
+            obj_idxs.push_back(int(std::find(m_objects->begin(), m_objects->end(), mo) - m_objects->begin()));
+        std::sort(obj_idxs.begin(), obj_idxs.end());
+        obj_idxs.erase(std::unique(obj_idxs.begin(), obj_idxs.end()), obj_idxs.end());
+    }
+    fix_through_cgal(obj_idxs, {});
+}
+
+void ObjectList::fix_through_cgal(const std::vector<int> &obj_idxs, const std::vector<int> &vol_idxs)
 {
     // Do not fix anything when a gizmo is open. There might be issues with updates
     // and what is worse, the snapshot time would refer to the internal stack.
-    if (!wxGetApp().plater()->get_view3D_canvas3D()->get_gizmos_manager().check_gizmos_closed_except(GLGizmosManager::Undefined))
+    if (obj_idxs.empty() || !wxGetApp().plater()->get_view3D_canvas3D()->get_gizmos_manager().check_gizmos_closed_except(GLGizmosManager::Undefined))
         return;
 
     //          model_name
     std::vector<std::string>                           succes_models;
     //                   model_name     failing reason
     std::vector<std::pair<std::string, std::string>>   failed_models;
-
-    std::vector<int> obj_idxs, vol_idxs;
-    get_selection_indexes(obj_idxs, vol_idxs);
+    size_t                                             unchanged_models = 0;
+    bool                                               painting_removed = false;
 
     std::vector<std::string> model_names;
 
-    // clear selections from the non-broken models if any exists
-    // and than fill names of models to repairing
     if (vol_idxs.empty()) {
-#if !FIX_THROUGH_CGAL_ALWAYS
-        for (int i = int(obj_idxs.size())-1; i >= 0; --i)
-                if (object(obj_idxs[i])->get_repaired_errors_count() == 0)
-                    obj_idxs.erase(obj_idxs.begin()+i);
-#endif // FIX_THROUGH_CGAL_ALWAYS
         for (int obj_idx : obj_idxs)
             if (object(obj_idx))
                 model_names.push_back(object(obj_idx)->name);
@@ -6328,31 +6342,26 @@ void ObjectList::fix_through_cgal()
     else {
         ModelObject* obj = object(obj_idxs.front());
         if (obj) {
-#if !FIX_THROUGH_CGAL_ALWAYS
-            for (int i = int(vol_idxs.size()) - 1; i >= 0; --i)
-                if (obj->get_repaired_errors_count(vol_idxs[i]) == 0)
-                    vol_idxs.erase(vol_idxs.begin() + i);
-#endif // FIX_THROUGH_CGAL_ALWAYS
             for (int vol_idx : vol_idxs)
                 model_names.push_back(obj->volumes[vol_idx]->name);
         }
     }
 
     auto plater = wxGetApp().plater();
+    const bool keep_painting = GUI::wxGetApp().app_config->get_bool("keep_painting");
 
-    auto fix_and_update_progress = [this, plater, model_names](const int obj_idx, const int vol_idx,
-                                          int model_idx,
-                                          ProgressDialog& progress_dlg,
-                                          std::vector<std::string>& succes_models,
-                                          std::vector<std::pair<std::string, std::string>>& failed_models)
+    auto fix_and_update_progress = [&](const int obj_idx, const int vol_idx, int model_idx, ProgressDialog& progress_dlg)
     {
-        if (!object(obj_idx))
+        ModelObject *mo = object(obj_idx);
+        if (!mo)
             return false;
 
         const std::string& model_name = model_names[model_idx];
         wxString msg = _L("Repairing model object");
         if (model_names.size() == 1)
             msg += ": " + from_u8(model_name) + "\n";
+        else if (model_names.size() > 10)
+            msg += ": " + from_u8(model_name) + wxString::Format(" (%d/%d)", model_idx + 1, int(model_names.size())) + "\n";
         else {
             msg += ":\n";
             for (int i = 0; i < int(model_names.size()); ++i)
@@ -6360,33 +6369,29 @@ void ObjectList::fix_through_cgal()
             msg += "\n";
         }
 
-        const bool keep_painting = GUI::wxGetApp().app_config->get_bool("keep_painting");
-        if (!keep_painting) {
-            plater->clear_before_change_mesh(obj_idx);
-        }
-        const size_t volumes_before = object(obj_idx)->volumes.size();
+        auto count_painted = [mo]() { return std::count_if(mo->volumes.begin(), mo->volumes.end(), [](const ModelVolume *mv) { return mv->is_any_painted(); }); };
+        const auto  painted_before = count_painted();
         std::string res;
-        if (!fix_model_with_cgal_gui(*(object(obj_idx)), vol_idx, progress_dlg, msg, res, keep_painting))
+        bool        modified = false;
+        if (!fix_model_with_cgal_gui(*mo, vol_idx, progress_dlg, msg, res, keep_painting, &modified))
             return false;
-        //wxGetApp().plater()->changed_mesh(obj_idx);
-        object(obj_idx)->ensure_on_bed();
-        plater->changed_mesh(obj_idx);
 
-        const size_t volumes_after = object(obj_idx)->volumes.size();
-        if (volumes_after != volumes_before)
-            add_volumes_to_object_in_list(obj_idx);
+        if (modified) {
+            painting_removed = painting_removed || count_painted() < painted_before;
+            mo->ensure_on_bed();
+            plater->changed_mesh(obj_idx);
+            plater->get_partplate_list().notify_instance_update(obj_idx, 0);
+            plater->sidebar().obj_list()->update_plate_values_for_items();
+            update_item_error_icon(obj_idx, vol_idx);
+            update_info_items(obj_idx);
+        }
 
-        plater->get_partplate_list().notify_instance_update(obj_idx, 0);
-        plater->sidebar().obj_list()->update_plate_values_for_items();
-
-        if (res.empty())
+        if (!res.empty())
+            failed_models.push_back({ model_name, res });
+        else if (modified)
             succes_models.push_back(model_name);
         else
-            failed_models.push_back({ model_name, res });
-
-        update_item_error_icon(obj_idx, vol_idx);
-        update_info_items(obj_idx);
-
+            ++unchanged_models;
         return true;
     };
 
@@ -6399,11 +6404,7 @@ void ObjectList::fix_through_cgal()
     if (vol_idxs.empty()) {
         int vol_idx{ -1 };
         for (int obj_idx : obj_idxs) {
-#if !FIX_THROUGH_CGAL_ALWAYS
-            if (object(obj_idx)->get_repaired_errors_count(vol_idx) == 0)
-                continue;
-#endif // FIX_THROUGH_CGAL_ALWAYS
-            if (!fix_and_update_progress(obj_idx, vol_idx, model_idx, progress_dlg, succes_models, failed_models))
+            if (!fix_and_update_progress(obj_idx, vol_idx, model_idx, progress_dlg))
                 break;
             model_idx++;
         }
@@ -6411,7 +6412,7 @@ void ObjectList::fix_through_cgal()
     else {
         int obj_idx{ obj_idxs.front() };
         for (int vol_idx : vol_idxs) {
-            if (!fix_and_update_progress(obj_idx, vol_idx, model_idx, progress_dlg, succes_models, failed_models))
+            if (!fix_and_update_progress(obj_idx, vol_idx, model_idx, progress_dlg))
                 break;
             model_idx++;
         }
@@ -6419,20 +6420,29 @@ void ObjectList::fix_through_cgal()
     // Close the progress dialog
     progress_dlg.Update(100, "");
 
+    if (painting_removed)
+        plater->notify_painting_removed();
+
     // Show info notification
-    wxString msg;
+    std::vector<wxString> blocks;
     wxString bullet_suf = "\n   - ";
     if (!succes_models.empty()) {
-        msg = _L_PLURAL("The following model object has been repaired", "The following model objects have been repaired", succes_models.size()) + ":";
+        wxString block = _L_PLURAL("The following model object has been repaired", "The following model objects have been repaired", succes_models.size()) + ":";
         for (auto& model : succes_models)
-            msg += bullet_suf + from_u8(model);
-        msg += "\n\n";
+            block += bullet_suf + from_u8(model);
+        blocks.push_back(block);
     }
     if (!failed_models.empty()) {
-        msg += _L_PLURAL("Failed to repair the following model object", "Failed to repair the following model objects", failed_models.size()) + ":\n";
+        wxString block = _L_PLURAL("Failed to repair the following model object", "Failed to repair the following model objects", failed_models.size()) + ":";
         for (auto& model : failed_models)
-            msg += bullet_suf + from_u8(model.first) + ": " + _(model.second);
+            block += bullet_suf + from_u8(model.first) + ": " + _(model.second);
+        blocks.push_back(block);
     }
+    if (unchanged_models > 0)
+        blocks.push_back(format_wxstr(_L_PLURAL("%1$d model object needed no repair.", "%1$d model objects needed no repair.", unchanged_models), unchanged_models));
+    wxString msg;
+    for (const wxString &block : blocks)
+        msg += (msg.IsEmpty() ? "" : "\n\n") + block;
     if (msg.IsEmpty())
         msg = _L("Repairing was canceled");
     plater->get_notification_manager()->push_notification(NotificationType::CgalFinished, NotificationManager::NotificationLevel::PrintInfoShortNotificationLevel, into_u8(msg));

src/slic3r/GUI/GUI_ObjectList.hpp

@@ -47,9 +47,6 @@ typedef double                                      coordf_t;
 typedef std::pair<coordf_t, coordf_t>               t_layer_height_range;
 typedef std::map<t_layer_height_range, ModelConfig> t_layer_config_ranges;
 
-// Manifold mesh may contain self-intersections, so we want to always allow fixing the mesh.
-#define FIX_THROUGH_CGAL_ALWAYS 1
-
 namespace GUI {
 
 enum class Shortcut : uint8_t;
@@ -463,6 +460,9 @@ public:
     void split_instances();
     void rename_item();
     void fix_through_cgal();
+    // Fixes every object on the selected plate, or on all plates.
+    void fix_all_through_cgal(bool all_plates);
+    void fix_through_cgal(const std::vector<int> &obj_idxs, const std::vector<int> &vol_idxs);
     void simplify();
     void smooth_mesh();
     void update_item_error_icon(const int obj_idx, int vol_idx) const ;

src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp

@@ -1036,6 +1036,11 @@ bool GLGizmoPainterBase::on_mouse(const wxMouseEvent &mouse_event)
     Vec2d mouse_pos = mouse_coord.cast<double>();
 
     if (mouse_event.Moving()) {
+        // No button is down, yet a stroke is still open: its release went elsewhere, as a paint drag does not
+        // capture the mouse. End the stroke as that release would have.
+        if (m_button_down != Button::None)
+            gizmo_event(m_button_down == Button::Left ? SLAGizmoEventType::LeftUp : SLAGizmoEventType::RightUp, mouse_pos,
+                        mouse_event.ShiftDown(), mouse_event.AltDown(), false);
         gizmo_event(SLAGizmoEventType::Moving, mouse_pos, mouse_event.ShiftDown(), mouse_event.AltDown(), false);
         return false;
     }
@@ -1205,6 +1210,10 @@ void GLGizmoPainterBase::on_set_state()
         m_old_mo_id = -1;
         //m_iva.release_geometry();
         m_triangle_selectors.clear();
+        // A stroke still open goes with the selectors. Its state must not carry into the next session, where the
+        // first move would end it as if released and the first press would paint a line from its last position.
+        m_button_down      = Button::None;
+        m_last_mouse_click = Vec2d::Zero();
 
         //Camera& camera = wxGetApp().plater()->get_camera();
         //camera.look_at(camera.get_position(), m_previous_target, Vec3d::UnitZ());

src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp

@@ -562,6 +562,11 @@ void GLGizmoTextureDisplacement::on_shutdown()
     m_shaded_island_delta  = Eigen::Matrix<float, 2, 3>::Identity();
     m_island_drag_active = false;
     m_island_move_set.clear();
+    // The pane closes below, taking the highlight with it, and the view must not open the next session in a
+    // Fast the user never picked. Set directly: nothing is to be queued against a gizmo that is closing.
+    if (m_island_view.switched)
+        m_use_shaded_preview = false;
+    m_island_view = IslandViewFollow{};
     m_adjust_texture_mode = false;
     m_seam_edit_mode      = false;
     m_adjust_drag_handle  = AdjustHandle::None;
@@ -727,18 +732,13 @@ void GLGizmoTextureDisplacement::render_painter_gizmo()
 
     // The UV editor's island selection, shown on the model. Polled here rather than pushed: the pane
     // changes its selection in its own mouse handling, and a compare of a few ints per frame is free.
-    {
-        const TextureDisplacementLayer *al = active_layer();
-        const UVEditorCanvas           *uv_canvas = wxGetApp().plater()->get_uv_editor_canvas();
-        if (m_show_uv_editor && al != nullptr && al->projection_method == TextureProjectionMethod::LSCM &&
-            uv_canvas != nullptr && !m_uv_editor_unwrap.empty()) {
-            if (uv_canvas->selected_islands() != m_island_overlay_selection)
-                rebuild_island_overlay(uv_canvas->selected_islands());
-            render_island_overlay();
-        } else if (m_island_overlay_glmodel.is_initialized()) {
-            m_island_overlay_glmodel.reset();
-            m_island_overlay_selection.clear();
-        }
+    if (const std::vector<int> *islands = island_highlight_selection()) {
+        if (*islands != m_island_overlay_selection)
+            rebuild_island_overlay(*islands);
+        render_island_overlay();
+    } else if (m_island_overlay_glmodel.is_initialized()) {
+        m_island_overlay_glmodel.reset();
+        m_island_overlay_selection.clear();
     }
 
     // Diagnostic overlays, drawn on top of whatever preview is active (both pull toward the camera
@@ -1520,7 +1520,7 @@ void GLGizmoTextureDisplacement::render_shaded_preview_mesh()
     // is box-filtered down to 128 px for a ~48 px row, and feeding it to the shader cost the preview
     // three quarters of the height map's detail - and, since height_tex_texel is derived from it, also
     // flattened the shading gradient and made the parallax march skip itself at angles where it should
-    // run. Cached on the image_data pointer + smoothing, so no PNG is decoded per frame.
+    // run. Cached per image_data and smoothing, so no PNG is decoded per frame.
     GLTexture *tex = get_layer_height_texture(*layer);
     if (tex == nullptr || tex->get_width() <= 0 || tex->get_height() <= 0)
         return;
@@ -1926,6 +1926,16 @@ void GLGizmoTextureDisplacement::render_paint_overlay(GLModel &overlay)
     shader->stop_using();
 }
 
+const std::vector<int> *GLGizmoTextureDisplacement::island_highlight_selection()
+{
+    const TextureDisplacementLayer *al        = active_layer();
+    const UVEditorCanvas           *uv_canvas = wxGetApp().plater()->get_uv_editor_canvas();
+    if (m_show_uv_editor && al != nullptr && al->projection_method == TextureProjectionMethod::LSCM &&
+        uv_canvas != nullptr && !m_uv_editor_unwrap.empty())
+        return &uv_canvas->selected_islands();
+    return nullptr;
+}
+
 void GLGizmoTextureDisplacement::rebuild_island_overlay(const std::vector<int> &selection)
 {
     m_island_overlay_glmodel.reset();
@@ -2651,6 +2661,37 @@ void GLGizmoTextureDisplacement::apply_view_mode(int mode)
     m_parent.set_as_dirty();
 }
 
+int GLGizmoTextureDisplacement::view_mode() const
+{
+    return m_use_shaded_preview                         ? 1 :
+           m_uv_check_mode == UVCheckMode::Checker    ? 2 :
+           m_uv_check_mode == UVCheckMode::Distortion ? 3 : 0;
+}
+
+int GLGizmoTextureDisplacement::IslandViewFollow::step(bool shown_now, int view, bool debug_open)
+{
+    shown = shown_now;
+    if (!shown) {
+        // The view is back to Normal already if a debug stage took it, and Normal applied over a stage would
+        // queue a preview job that replaces the stage being inspected.
+        const bool restore = switched && view == 1;
+        switched = keep_normal = false;
+        return restore ? 0 : -1;
+    }
+    if (view != 0 || keep_normal || debug_open)
+        return -1;
+    switched = true;
+    return 1;
+}
+
+void GLGizmoTextureDisplacement::follow_island_highlight()
+{
+    const std::vector<int> *islands = island_highlight_selection();
+    const int view = m_island_view.step(islands != nullptr && !islands->empty(), view_mode(), m_debug_stage >= 0);
+    if (view >= 0)
+        apply_view_mode(view);
+}
+
 void GLGizmoTextureDisplacement::push_uv_pane_state()
 {
     UVEditorCanvas *canvas = wxGetApp().plater()->get_uv_editor_canvas();
@@ -2891,7 +2932,8 @@ void GLGizmoTextureDisplacement::run_uv_command(int cmd, float value)
             rebuild_preview();
         }
     }
-    // FrameAll/ToggleSnap are handled inside the canvas; ProjectFromView is not wired yet.
+    // FrameAll/ToggleSnap are handled inside the canvas; ProjectFromView is not wired yet. SelectionChanged
+    // only asks for this frame: follow_island_highlight() and the overlay read the selection back themselves.
     m_parent.set_as_dirty();
 }
 
@@ -4038,8 +4080,8 @@ void GLGizmoTextureDisplacement::remove_texture_layer(int slot)
     if (slot >= 0 && slot < int(TEXTURE_DISPLACEMENT_MAX_LAYERS)) {
         mv->texture_displacement_facet(slot).reset();
         m_thumbnails[size_t(slot)].reset();
-        m_thumbnail_source[size_t(slot)] = nullptr;
-        m_layer_expanded[size_t(slot)]   = false;
+        m_thumbnail_source[size_t(slot)].reset();
+        m_layer_expanded[size_t(slot)] = false;
     }
     if (m_picker_slot == slot)
         m_picker_slot = -1;
@@ -4213,7 +4255,7 @@ int GLGizmoTextureDisplacement::select_visible_faces(const std::array<float, 12>
     selector.reset();
     for (unsigned i : unobscured)
         selector.set_facet(int(front_facing[i]), EnforcerBlockerType::ENFORCER);
-    selector.request_update_render_data();
+    selector.request_update_render_data(true);
 
     update_model_object();
     m_parent.set_as_dirty();
@@ -4236,7 +4278,7 @@ void GLGizmoTextureDisplacement::select_whole_model()
         const size_t facet_count = v->mesh().its.indices.size();
         for (size_t i = 0; i < facet_count; ++i)
             m_triangle_selectors[idx]->set_facet(int(i), EnforcerBlockerType::ENFORCER);
-        m_triangle_selectors[idx]->request_update_render_data();
+        m_triangle_selectors[idx]->request_update_render_data(true);
     }
     update_model_object();
     m_parent.set_as_dirty();
@@ -5342,7 +5384,7 @@ GLTexture *GLGizmoTextureDisplacement::get_layer_thumbnail(const TextureDisplace
         return nullptr;
 
     const size_t slot = size_t(layer.slot);
-    if (m_thumbnails[slot] && m_thumbnail_source[slot] == layer.image_data.get() &&
+    if (m_thumbnails[slot] && m_thumbnail_source[slot].lock() == layer.image_data &&
         m_thumbnail_smoothing[slot] == layer.smoothing)
         return m_thumbnails[slot].get();
 
@@ -5355,7 +5397,7 @@ GLTexture *GLGizmoTextureDisplacement::get_layer_thumbnail(const TextureDisplace
         return nullptr;
 
     m_thumbnails[slot]          = std::move(texture);
-    m_thumbnail_source[slot]    = layer.image_data.get();
+    m_thumbnail_source[slot]    = layer.image_data;
     m_thumbnail_smoothing[slot] = layer.smoothing;
     return m_thumbnails[slot].get();
 }
@@ -5364,17 +5406,17 @@ GLTexture *GLGizmoTextureDisplacement::get_layer_color_texture(const TextureDisp
 {
     if (layer.empty() || !layer.color_enabled)
         return nullptr;
-    if (m_color_tex && m_color_tex_source == layer.image_data.get() && m_color_tex_smoothing == layer.smoothing)
+    if (m_color_tex && m_color_tex_source.lock() == layer.image_data && m_color_tex_smoothing == layer.smoothing)
         return m_color_tex.get();
 
     std::unique_ptr<GLTexture> texture = upload_color_texture(decode_height_texture(layer), HEIGHT_TEX_MAX_PX);
     if (!texture) {
         m_color_tex.reset();
-        m_color_tex_source = nullptr;
+        m_color_tex_source.reset();
         return nullptr;
     }
     m_color_tex           = std::move(texture);
-    m_color_tex_source    = layer.image_data.get();
+    m_color_tex_source    = layer.image_data;
     m_color_tex_smoothing = layer.smoothing;
     return m_color_tex.get();
 }
@@ -5386,7 +5428,7 @@ GLTexture *GLGizmoTextureDisplacement::get_layer_height_texture(const TextureDis
 
     // One slot, not one per layer: the preview shader only ever shades the *active* layer, so a single
     // full-resolution upload is enough and the VRAM cost stays at one texture rather than eight.
-    if (m_height_tex && m_height_tex_source == layer.image_data.get() && m_height_tex_smoothing == layer.smoothing)
+    if (m_height_tex && m_height_tex_source.lock() == layer.image_data && m_height_tex_smoothing == layer.smoothing)
         return m_height_tex.get();
 
     std::unique_ptr<GLTexture> texture = upload_height_thumbnail(decode_height_texture(layer), HEIGHT_TEX_MAX_PX);
@@ -5394,7 +5436,7 @@ GLTexture *GLGizmoTextureDisplacement::get_layer_height_texture(const TextureDis
         return nullptr;
 
     m_height_tex           = std::move(texture);
-    m_height_tex_source    = layer.image_data.get();
+    m_height_tex_source    = layer.image_data;
     m_height_tex_smoothing = layer.smoothing;
     return m_height_tex.get();
 }
@@ -5835,6 +5877,9 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
     GizmoImguiBegin(get_name(), flags);
     ensure_panel_icons();
     process_uv_commands(); // clicks from the UV editor pane, run here where the GL context is current
+    // After the pane's commands, which can close it or change the view, and before the View row, so the row
+    // lights the view this frame ends up in and a click on it has the last word.
+    follow_island_highlight();
     const float previous_body_h   = m_panel_body_h;
     const float previous_footer_h = m_panel_footer_h;
 
@@ -6281,7 +6326,7 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                 if (v->is_model_part()) {
                     ++idx;
                     m_triangle_selectors[idx]->reset();
-                    m_triangle_selectors[idx]->request_update_render_data();
+                    m_triangle_selectors[idx]->request_update_render_data(true);
                 }
             update_model_object();
             m_parent.set_as_dirty();
@@ -6323,10 +6368,9 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
     // ---- View: Normal / Fast / Checker / Distortion as one group, Wireframe on its own ----
     // The underlying state stays m_use_shaded_preview + m_uv_check_mode.
     {
-        const int cur_mode = m_use_shaded_preview                               ? 1 :
-                             m_uv_check_mode == UVCheckMode::Checker    ? 2 :
-                             m_uv_check_mode == UVCheckMode::Distortion ? 3 : 0;
+        const int cur_mode = view_mode();
         int  new_mode       = cur_mode;
+        int  picked         = -1; // the button clicked, the active one included
         bool wf_toggle      = false;
         bool open_uv_editor = false;
         // Checker and Distortion both draw *the unwrap* - the first the texture grid laid over it, the second
@@ -6349,19 +6393,19 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
         ImGui::SetCursorPosX(std::max(ImGui::GetCursorPosX(), x0 + m_imgui->scaled(2.6f)));
         if (icon_toggle(701, "texture_displacement_real_preview.svg", cur_mode == 0, icon_md, _L("Normal"),
                         _L("Normal - the real geometry, exactly what Bake will produce. Slower to update")))
-            new_mode = 0;
+            new_mode = picked = 0;
         ImGui::SameLine(0.f, gap_s);
         if (icon_toggle(702, "texture_displacement_fast_preview.svg", cur_mode == 1, icon_md, _L("Fast"),
                         _L("Fast - the relief is only shaded on, not built, and only for the layer you are "
                            "editing. Updates instantly while you paint")))
-            new_mode = 1;
+            new_mode = picked = 1;
         ImGui::SameLine(0.f, gap_s);
         if (icon_toggle(703, "texture_displacement_checker.svg", cur_mode == 2, icon_md, _L("Checker"),
                         _L("Checker - a test grid instead of the texture. Where the squares stay square the "
                            "texture is undistorted; where they stretch, it will too. Opens the UV editor if "
                            "it is closed"),
                         uv_view_na)) {
-            new_mode       = 2;
+            new_mode       = picked = 2;
             open_uv_editor = true;
         }
         ImGui::SameLine(0.f, gap_s);
@@ -6369,7 +6413,7 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
                         _L("Distortion - blue-to-red stretch heatmap over the unwrap. Opens the UV editor if "
                            "it is closed"),
                         uv_view_na)) {
-            new_mode       = 3;
+            new_mode       = picked = 3;
             open_uv_editor = true;
         }
         vsep(icon_md);
@@ -6393,6 +6437,8 @@ void GLGizmoTextureDisplacement::on_render_input_window(float x, float y, float
             if (new_mode == cur_mode)
                 update_uv_editor(); // otherwise apply_view_mode() below does it
         }
+        if (picked >= 0)
+            m_island_view.picked(picked);
         if (new_mode != cur_mode)
             apply_view_mode(new_mode);
         if (wf_toggle) {

src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp

@@ -197,6 +197,27 @@ public:
     };
     static PaintedColors painted_colors(const TriangleMesh &mesh, const TriangleSelector::TriangleSplittingData &paint);
 
+    // The view while the UV editor's selected islands are highlighted on the model. The highlight lies on the
+    // undisplaced surface, so the Normal view's relief hides it wherever it rises: Normal gives way to Fast
+    // while islands are selected and comes back once none are. A view the user clicks in the View row is
+    // theirs - the pane's background buttons are not a pick, Height only meaning "the texture view".
+    struct IslandViewFollow
+    {
+        bool shown       = false; // the highlight, as of the last step()
+        bool switched    = false; // Fast was switched on for the highlight, so Normal comes back once it is gone
+        bool keep_normal = false; // the user picked Normal in the View row while the highlight was shown
+        // The view to apply this frame (0 Normal, 1 Fast), or -1 for none. `view` is the one on screen, numbered as
+        // apply_view_mode() takes it; `debug_open` a debug stage on screen, which holds Normal itself.
+        int  step(bool shown_now, int view, bool debug_open);
+        // A View row button clicked, the active one included. The row is drawn after step() in the same frame,
+        // so `shown` is this frame's.
+        void picked(int view)
+        {
+            switched    = false;
+            keep_normal = shown && view == 0;
+        }
+    };
+
     void render_painter_gizmo() override;
 
     // Intercepts mouse input while "Adjust Texture" mode is on (dragging the on-canvas offset/
@@ -513,6 +534,11 @@ private:
     // The panel's view modes: 0 Normal, 1 Fast, 2 Checker, 3 Distortion. Shared by the View row and the pane's
     // background buttons, so both switch views the same way.
     void apply_view_mode(int mode);
+    // The view on screen, numbered as apply_view_mode() takes it.
+    int  view_mode() const;
+    // Run once a frame, after the pane's commands: switches the view as m_island_view says.
+    void             follow_island_highlight();
+    IslandViewFollow m_island_view;
     // The pane header's thumbnail of the active layer's texture, rebuilt only when its image changes.
     static constexpr int       UV_THUMB_PX       = 64;
     const void                *m_uv_thumb_source = nullptr;
@@ -744,6 +770,8 @@ private:
     // in place. Rebuilt whenever the pane's selection differs from the one it was built for.
     GLModel          m_island_overlay_glmodel;
     std::vector<int> m_island_overlay_selection;
+    // The pane's selection while the overlay applies - the pane open over an unwrapped LSCM layer - else null.
+    const std::vector<int> *island_highlight_selection();
     void             rebuild_island_overlay(const std::vector<int> &selection);
     void             render_island_overlay();
     // Set on every paint event, cleared when the overlay is rebuilt in render_painter_gizmo(). Kept
@@ -924,25 +952,26 @@ private:
     bool m_preview_job_pending = false;
     void queue_preview_job();
 
-    // Per-slot GPU thumbnail cache for the layer list panel, keyed by the image_data pointer that
-    // was current the last time each thumbnail was built (see get_layer_thumbnail()).
-    std::array<std::unique_ptr<GLTexture>, TEXTURE_DISPLACEMENT_MAX_LAYERS> m_thumbnails;
-    std::array<const void *, TEXTURE_DISPLACEMENT_MAX_LAYERS>               m_thumbnail_source{};
+    // Per-slot GPU thumbnail cache for the layer list panel, each keyed by the image_data it was built from
+    // (see get_layer_thumbnail()). Held weakly rather than by address, as decode_height_texture()'s cache is:
+    // an image freed and replaced by another at the same address must not pass for it.
+    std::array<std::unique_ptr<GLTexture>, TEXTURE_DISPLACEMENT_MAX_LAYERS>                       m_thumbnails;
+    std::array<std::weak_ptr<const std::vector<unsigned char>>, TEXTURE_DISPLACEMENT_MAX_LAYERS> m_thumbnail_source;
     // The smoothing each cached thumbnail was built at, so a smoothing change re-uploads it.
-    std::array<float, TEXTURE_DISPLACEMENT_MAX_LAYERS>                      m_thumbnail_smoothing{};
+    std::array<float, TEXTURE_DISPLACEMENT_MAX_LAYERS>                                            m_thumbnail_smoothing{};
 
     // Full-resolution height texture for the preview shader, keyed the same way (see
     // get_layer_height_texture()). A smoothing change re-uploads it, so the fast preview shows the
     // blur the bake will apply.
-    std::unique_ptr<GLTexture> m_height_tex;
-    const void                *m_height_tex_source    = nullptr;
-    float                      m_height_tex_smoothing = -1.f;
+    std::unique_ptr<GLTexture>                      m_height_tex;
+    std::weak_ptr<const std::vector<unsigned char>> m_height_tex_source;
+    float                                           m_height_tex_smoothing = -1.f;
 
     // The same, for the layer's *colour*, which the fast preview quantizes per fragment so it shows
     // the image at texel resolution rather than at the mesh's. Null for a grayscale texture.
-    std::unique_ptr<GLTexture> m_color_tex;
-    const void                *m_color_tex_source    = nullptr;
-    float                      m_color_tex_smoothing = -1.f;
+    std::unique_ptr<GLTexture>                      m_color_tex;
+    std::weak_ptr<const std::vector<unsigned char>> m_color_tex_source;
+    float                                           m_color_tex_smoothing = -1.f;
 
     // Library textures the picker has shown at least once, keyed by file path (see LibraryTexture).
     std::map<std::string, LibraryTexture> m_library_textures;

src/slic3r/GUI/Gizmos/GLGizmosManager.cpp

@@ -420,7 +420,10 @@ void GLGizmosManager::refresh_on_off_state()
 
 void GLGizmosManager::reset_all_states()
 {
-    if (! m_enabled || m_serializing)
+    // The restore/new-project event can run before deferred OpenGL resource
+    // loading has populated the gizmo list.  There is nothing to reset until
+    // initialization completes.
+    if (! m_enabled || m_serializing || m_gizmos.empty())
         return;
 
     const EType current = get_current_type();
@@ -435,6 +438,9 @@ void GLGizmosManager::reset_all_states()
 
 bool GLGizmosManager::open_gizmo(EType type)
 {
+    if (m_gizmos.empty())
+        return false;
+
     int idx = static_cast<int>(type);
 
     // re-open same type cause closing
@@ -522,7 +528,7 @@ bool GLGizmosManager::is_running() const
 
 bool GLGizmosManager::open_gizmo_by_shortcut(Shortcut shortcut)
 {
-    if (!m_enabled)
+    if (!m_enabled || m_gizmos.empty())
         return false;
 
     // The text tool opens without a selection because it creates its own object.
@@ -1427,10 +1433,12 @@ void GLGizmosManager::update_hover_state(const EType &type)
 
 bool GLGizmosManager::activate_gizmo(EType type)
 {
-    assert(!m_gizmos.empty());
-
     // already activated
-    if (m_current == type) return true;
+    if (m_current == type)
+        return true;
+
+    if (m_gizmos.empty())
+        return false;
 
     if (m_current != Undefined) {
         // clean up previous gizmo

src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp

@@ -925,8 +925,9 @@ void GizmoObjectManipulation::do_render_move_window(ImGuiWrapper *imgui_wrapper,
 
     m_last_active_item = current_active_id;
     last_move_input_window_width = ImGui::GetWindowWidth();
+    ImGui::PopStyleVar();
     imgui_wrapper->end();
-    ImGui::PopStyleVar(2);
+    ImGui::PopStyleVar();
     ImGuiWrapper::pop_toolbar_style();
 }
 
@@ -1131,10 +1132,11 @@ void GizmoObjectManipulation::do_render_rotate_window(ImGuiWrapper *imgui_wrappe
 
     m_last_active_item = current_active_id;
     last_rotate_input_window_width = ImGui::GetWindowWidth();
+    ImGui::PopStyleVar();
     imgui_wrapper->end();
 
     // BBS
-    ImGui::PopStyleVar(2);
+    ImGui::PopStyleVar();
     ImGuiWrapper::pop_toolbar_style();
 }
 

src/slic3r/GUI/LegacyPrinterMigrationDialog.cpp

@@ -1,96 +0,0 @@
-#include "LegacyPrinterMigrationDialog.hpp"
-
-#include "GUI.hpp"
-#include "GUI_App.hpp"
-#include "GUI_Utils.hpp"
-#include "I18N.hpp"
-#include "MainFrame.hpp"
-#include "format.hpp"
-#include "libslic3r/Preset.hpp"
-#include "Widgets/Button.hpp"
-#include "Widgets/CheckBox.hpp"
-#include "Widgets/DialogButtons.hpp"
-#include "Widgets/Label.hpp"
-
-#include <wx/event.h>
-#include <wx/gdicmn.h>
-#include <wx/sizer.h>
-#include <wx/string.h>
-#include <wx/textctrl.h>
-#include <wx/toplevel.h>
-
-#include <string>
-#include <vector>
-
-namespace Slic3r { namespace GUI {
-
-LegacyPrinterMigrationDialog::LegacyPrinterMigrationDialog(wxWindow *parent, const std::vector<LegacyPrinterMigration> &migrations,
-                                                           bool offer_dont_remind)
-    : DPIDialog(parent ? parent : static_cast<wxWindow *>(wxGetApp().mainframe), wxID_ANY, _L("Migrate Filament Presets"),
-                wxDefaultPosition, wxDefaultSize, wxCAPTION | wxCLOSE_BOX)
-{
-    SetBackgroundColour(*wxWHITE);
-    SetFont(Label::Body_14);
-
-    auto *sizer = new wxBoxSizer(wxVERTICAL);
-
-    auto *message = new Label(this,
-        _L("Since OrcaSlicer 2.5.0, filament presets have been restructured to support more features. Some of your "
-           "presets need to be migrated to the new structure, or they will no longer be available for some of your "
-           "printers.\n\n"
-           "Would you like to migrate them now? Your presets will be backed up first, and this only needs to be done "
-           "once. You can also do it later from Help > Migrate Filament Presets."),
-        0);
-    message->Wrap(FromDIP(520));
-    sizer->Add(message, 0, wxEXPAND | wxALL, FromDIP(15));
-
-    sizer->Add(new Label(this, _L("Affected presets:")), 0, wxLEFT | wxRIGHT, FromDIP(15));
-    sizer->AddSpacer(FromDIP(5));
-
-    wxString details;
-    for (const LegacyPrinterMigration &migration : migrations) {
-        details += format_wxstr(_L("%1% (based on %2%)"), migration.preset, migration.parent) + "\n";
-        for (const std::string &printer : migration.printers)
-            details += "    " + from_u8(printer) + "\n";
-    }
-    auto *list = new wxTextCtrl(this, wxID_ANY, details, wxDefaultPosition, wxSize(-1, FromDIP(220)),
-                                wxTE_MULTILINE | wxTE_READONLY | wxTE_DONTWRAP);
-    sizer->Add(list, 1, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(15));
-
-    if (offer_dont_remind) {
-        auto *dont_remind_sizer = new wxBoxSizer(wxHORIZONTAL);
-        m_dont_remind           = new ::CheckBox(this);
-        auto *dont_remind_label = new Label(this, _L("Don't remind me again"));
-        dont_remind_label->Bind(wxEVT_LEFT_DOWN, [this](wxMouseEvent &e) {
-            m_dont_remind->SetValue(!m_dont_remind->GetValue());
-            e.Skip();
-        });
-        dont_remind_sizer->Add(m_dont_remind, 0, wxALIGN_CENTER_VERTICAL);
-        dont_remind_sizer->Add(dont_remind_label, 0, wxALIGN_CENTER_VERTICAL | wxLEFT, FromDIP(6));
-        sizer->Add(dont_remind_sizer, 0, wxLEFT | wxRIGHT | wxTOP, FromDIP(15));
-    }
-
-    auto *buttons = new DialogButtons(this, {"Yes", "No"}, "Yes");
-    buttons->GetYES()->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { EndModal(wxID_YES); });
-    buttons->GetNO()->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { EndModal(wxID_NO); });
-    sizer->Add(buttons, 0, wxEXPAND);
-
-    SetSizerAndFit(sizer);
-    CenterOnParent();
-    wxGetApp().UpdateDlgDarkUI(this);
-}
-
-bool LegacyPrinterMigrationDialog::dont_remind() const
-{
-    return m_dont_remind != nullptr && m_dont_remind->GetValue();
-}
-
-void LegacyPrinterMigrationDialog::on_dpi_changed(const wxRect &)
-{
-    if (m_dont_remind != nullptr)
-        m_dont_remind->Rescale();
-    GetSizer()->SetSizeHints(this);
-    Refresh();
-}
-
-}} // namespace Slic3r::GUI

src/slic3r/GUI/LegacyPrinterMigrationDialog.hpp

@@ -1,34 +0,0 @@
-#pragma once
-
-#include "GUI_Utils.hpp"
-
-#include <vector>
-
-class CheckBox;
-class wxWindow;
-class wxRect;
-
-namespace Slic3r {
-
-struct LegacyPrinterMigration;
-
-namespace GUI {
-
-// Lists the user filament presets that no longer show on printers their parent listed in an older
-// release, and asks whether to migrate them. ShowModal() returns wxID_YES to migrate. With
-// offer_dont_remind it also offers to stop the startup reminder for good.
-class LegacyPrinterMigrationDialog : public DPIDialog
-{
-public:
-    LegacyPrinterMigrationDialog(wxWindow *parent, const std::vector<LegacyPrinterMigration> &migrations, bool offer_dont_remind);
-
-    bool dont_remind() const;
-
-protected:
-    void on_dpi_changed(const wxRect &suggested_rect) override;
-
-private:
-    ::CheckBox *m_dont_remind{nullptr};
-};
-
-}} // namespace Slic3r::GUI

src/slic3r/GUI/MainFrame.cpp

@@ -2827,10 +2827,6 @@ wxMenu* MainFrame::generate_help_menu()
     append_menu_item(helpMenu, wxID_ANY, _L("Show Configuration Folder"), _L("Show Configuration Folder"),
         [](wxCommandEvent&) { Slic3r::GUI::desktop_open_datadir_folder(); });
 
-    append_menu_item(helpMenu, wxID_ANY, _L("Migrate Filament Presets"),
-        _L("Bring back filament presets that a profile update removed from printers they were made for"),
-        [](wxCommandEvent&) { wxGetApp().check_legacy_printer_migration(true); });
-
     helpMenu->AppendSeparator();
 
     // Troubleshoot center

src/slic3r/GUI/NativeCommands.cpp

@@ -589,10 +589,6 @@ std::vector<NativeCommand> build_command_catalog()
         Slic3r::GUI::desktop_open_datadir_folder();
         return AppActionRunResult{AppActionRunResult::Level::Success};
     });
-    add("help_migrate_filament_presets", L("Migrate Filament Presets"), L("Help"), [](const std::string&) {
-        wxGetApp().check_legacy_printer_migration(true);
-        return AppActionRunResult{AppActionRunResult::Level::Success};
-    });
     add("help_troubleshoot", L("Troubleshoot Center"), L("Help"), [](const std::string&) {
         wxGetApp().troubleshoot();
         return AppActionRunResult{AppActionRunResult::Level::Success};

src/slic3r/GUI/PartPlate.cpp

@@ -1880,13 +1880,6 @@ void PartPlate::render_exclude_area(bool force_default_color) {
 	// draw exclude area
 	glsafe(::glDepthMask(GL_FALSE));
 
-	if (m_selected) {
-		glsafe(::glColor4fv(select_color.data()));
-	}
-	else {
-		glsafe(::glColor4fv(unselect_color.data()));
-	}
-
 	m_exclude_triangles.set_color(m_selected ? select_color : unselect_color);
     m_exclude_triangles.render();
 	glsafe(::glDepthMask(GL_TRUE));

src/slic3r/GUI/Plater.cpp

@@ -14984,24 +14984,8 @@ bool Plater::priv::can_fix_through_cgal() const
     std::vector<int> obj_idxs, vol_idxs;
     sidebar->obj_list()->get_selection_indexes(obj_idxs, vol_idxs);
 
-#if FIX_THROUGH_CGAL_ALWAYS
-    // Fixing always.
+    // A closed mesh may still self-intersect, so fixing is always allowed.
     return ! obj_idxs.empty() || ! vol_idxs.empty();
-#else // FIX_THROUGH_CGAL_ALWAYS
-    // Fixing only if the model is not manifold.
-    if (vol_idxs.empty()) {
-        for (auto obj_idx : obj_idxs)
-            if (model.objects[obj_idx]->get_repaired_errors_count() > 0)
-                return true;
-        return false;
-    }
-
-    int obj_idx = obj_idxs.front();
-    for (auto vol_idx : vol_idxs)
-        if (model.objects[obj_idx]->get_repaired_errors_count(vol_idx) > 0)
-            return true;
-    return false;
-#endif // FIX_THROUGH_CGAL_ALWAYS
 }
 
 bool Plater::priv::can_simplify() const
@@ -22041,13 +22025,16 @@ void Plater::clear_before_change_mesh(int obj_idx)
         mv->mmu_segmentation_facets.reset();
         mv->fuzzy_skin_facets.reset();
     }
-    if (paint_removed) {
-        // snapshot_time is captured by copy so the lambda knows where to undo/redo to.
-        get_notification_manager()->push_notification(
-                    NotificationType::CustomSupportsAndSeamRemovedAfterRepair,
-                    NotificationManager::NotificationLevel::PrintInfoNotificationLevel,
-                    _u8L("Custom supports and color painting were removed before repairing."));
-    }
+    if (paint_removed)
+        notify_painting_removed();
+}
+
+void Plater::notify_painting_removed()
+{
+    get_notification_manager()->push_notification(
+                NotificationType::CustomSupportsAndSeamRemovedAfterRepair,
+                NotificationManager::NotificationLevel::PrintInfoNotificationLevel,
+                _u8L("Custom supports and color painting were removed before repairing."));
 }
 
 void Plater::changed_mesh(int obj_idx)

src/slic3r/GUI/Plater.hpp

@@ -599,6 +599,7 @@ public:
     void reslice_SLA_until_step(SLAPrintObjectStep step, const ModelObject &object, bool postpone_error_messages = false);
 
     void clear_before_change_mesh(int obj_idx);
+    void notify_painting_removed();
     void changed_mesh(int obj_idx);
 
     void changed_object(ModelObject &object);

src/slic3r/GUI/Tab.cpp

@@ -3098,6 +3098,7 @@ void TabPrint::build()
         optgroup = page->new_optgroup(L("Raft"), L"param_raft");
         optgroup->append_single_option_line("raft_layers", "support_settings_raft");
         optgroup->append_single_option_line("raft_contact_distance", "support_settings_raft");
+        optgroup->append_single_option_line("raft_expansion", "support_settings_raft");
 
         optgroup = page->new_optgroup(L("Filament for Supports"), L"param_support_filament");
         optgroup->append_single_option_line("support_filament", "support_settings_filament#base");

src/slic3r/GUI/TextureImportDialog.cpp

@@ -14,7 +14,7 @@
 #include "Widgets/StateColor.hpp"
 #include "Widgets/StaticLine.hpp"
 #include "libslic3r/ColorDecomposeRecipe.hpp"
-#include "libslic3r/MeshBoolean.hpp"
+#include "libslic3r/MeshRepair.hpp"
 #include "libslic3r/TriangleSelector.hpp"
 
 #include <utility>
@@ -2436,25 +2436,25 @@ void TextureImportDialog::start_computation(bool auto_color, bool initial)
     settings.target_colors_num = auto_color ? 0 : (size_t)m_param_color_count;
     settings.smooth_weight     = m_param_smooth / 10.0;
     settings.mesh_repair_decision = m_mesh_repair_decision;
-    // BBS repairs the mesh through the Windows 3D SDK, which is only available on Windows
-    // builds that ship the SDK. Orca's CGAL-based repair (MeshBoolean::cgal::repair) works
-    // on all three platforms, so use that instead.
     settings.mesh_repair_callback = [](const indexed_triangle_set& mesh,
                                        indexed_triangle_set&       repaired_mesh,
                                        std::function<void(const char*, unsigned)> progress_callback,
                                        std::function<bool()>       cancel_callback,
                                        std::string*                error_message) -> bool {
-        if (cancel_callback && cancel_callback())
-            return false;
         if (progress_callback)
             progress_callback(_u8L("Repairing mesh").c_str(), 0);
 
+        struct Canceled {};
         TriangleMesh tm(mesh);
-        if (!MeshBoolean::cgal::repair(tm, nullptr, error_message))
-            return false;
-
-        if (cancel_callback && cancel_callback())
+        try {
+            if (!repair_mesh(tm, nullptr, error_message, [&cancel_callback](int) {
+                    if (cancel_callback && cancel_callback())
+                        throw Canceled();
+                }))
+                return false;
+        } catch (const Canceled &) {
             return false;
+        }
         repaired_mesh = tm.its;
         if (progress_callback)
             progress_callback(_u8L("Repairing mesh").c_str(), 100);
@@ -2683,12 +2683,12 @@ void TextureImportDialog::on_mesh_repair_decision_required(wxCommandEvent&)
         m_progress_dlg = nullptr;
     }
 
-#ifdef HAS_WIN10SDK
     Slic3r::GUI::MessageDialog dlg(initial ? GetParent() : this,
-        _L("The mesh has non-manifold geometry or open boundaries. You can import it as-is or repair it with Windows 3D repair service before importing."),
-        _L("Mesh repair"), wxYES_NO | wxICON_WARNING | wxYES_DEFAULT);
+        _L("The mesh has non-manifold geometry or open boundaries. You can import it as-is or repair it before importing."),
+        _L("Mesh repair"), wxYES_NO | wxCANCEL | wxICON_WARNING | wxYES_DEFAULT);
     dlg.SetButtonLabel(wxID_YES, _L("Import without repair"));
     dlg.SetButtonLabel(wxID_NO, _L("Repair and import"), true);
+    dlg.SetButtonLabel(wxID_CANCEL, _L("Cancel"));
     // "Repair and import" is the recommended action here, so the accent moves off the default YES
     // button onto NO. MsgDialog::add_button already styled both as ButtonType::Choice, so restyling
     // with the same type swaps only the palette and leaves the geometry alone.
@@ -2704,17 +2704,7 @@ void TextureImportDialog::on_mesh_repair_decision_required(wxCommandEvent&)
     dlg.Fit();
     dlg.CenterOnParent();
     int ret = dlg.ShowModal();
-    m_mesh_repair_decision = (ret == wxID_NO)
-        ? Slic3r::TexturePaintingSettings::MeshRepairDecision::RepairAndImport
-        : Slic3r::TexturePaintingSettings::MeshRepairDecision::ImportWithoutRepair;
-#else
-    Slic3r::GUI::MessageDialog dlg(initial ? GetParent() : this,
-        _L("Please note that the mesh has non-manifold geometry or open boundaries."),
-        _L("Mesh issue"), wxOK | wxCANCEL | wxICON_WARNING | wxOK_DEFAULT);
-    dlg.SetButtonLabel(wxID_OK, _L("Continue"), true);
-    dlg.SetButtonLabel(wxID_CANCEL, _L("Cancel"));
-    int ret = dlg.ShowModal();
-    if (ret != wxID_OK) {
+    if (ret == wxID_CANCEL) {
         m_cancel_flag = true;
         if (initial) {
             m_initial_computation_cancelled = true;
@@ -2727,8 +2717,9 @@ void TextureImportDialog::on_mesh_repair_decision_required(wxCommandEvent&)
         }
         return;
     }
-    m_mesh_repair_decision = Slic3r::TexturePaintingSettings::MeshRepairDecision::ImportWithoutRepair;
-#endif
+    m_mesh_repair_decision = (ret == wxID_NO)
+        ? Slic3r::TexturePaintingSettings::MeshRepairDecision::RepairAndImport
+        : Slic3r::TexturePaintingSettings::MeshRepairDecision::ImportWithoutRepair;
 
     start_computation(auto_color, initial);
 }

src/slic3r/GUI/UVEditorCanvas.cpp

@@ -939,7 +939,8 @@ void UVEditorCanvas::on_mouse(wxMouseEvent &evt)
             m_active_edge = (hit.first >= 0 && is_edge_selected(hit)) ? hit : std::pair<int, int>{ -1, -1 };
             m_gesture     = (m_active_edge.first >= 0) ? Gesture::MoveEdge : Gesture::Pan;
         } else {
-            const int hit = island_at(uv);
+            const std::vector<int> selection_before = m_selection;
+            const int              hit              = island_at(uv);
             if (hit >= 0) {
                 if (evt.ShiftDown()) {
                     // Shift adds to the selection (and makes the clicked one the new primary).
@@ -969,6 +970,10 @@ void UVEditorCanvas::on_mouse(wxMouseEvent &evt)
                 m_selected_island = -1;
             }
             m_gesture = (m_selected_island >= 0) ? Gesture::MoveIsland : Gesture::Pan;
+            // The owner shows the selection on the model and would not hear of this click otherwise in time: a
+            // click that clears the selection starts no gesture, and one that sets it reports only on release.
+            if (m_selection != selection_before)
+                run_command(Command::SelectionChanged);
         }
         grab_mouse();
         Refresh();

src/slic3r/GUI/UVEditorCanvas.hpp

@@ -108,10 +108,12 @@ public:
     // the command callback - the canvas has the selection and the view, the gizmo has the layer.
     // `value` carries the new setting for the Set* commands (an angle, a flag as 0/1, or an index into
     // SelectMode / Background) and is 0 otherwise.
+    // SelectionChanged is sent by the canvas itself when a click changes the island selection. It carries
+    // nothing: the owner reads selected_islands() back, and only needs telling that it should look.
     enum class Command {
         FrameAll, ToggleSnap, AverageScale, CutSelectedIsland, ProjectFromView, JoinSelected, UnjoinSelected,
         Unwrap, SetSeamAngle, SetConnectIslands, SetSelectMode, SetMarkSeams, SetSeamPath, ClearSeams, ClearUVEdits,
-        SetBackground, PickTexture, PaneClosed
+        SetBackground, PickTexture, PaneClosed, SelectionChanged
     };
     void run_command(Command cmd, float value = 0.f);
     using CommandFn = std::function<void(Command, float)>;

src/slic3r/Utils/FixModelByCgal.cpp

@@ -3,240 +3,115 @@
 #include <algorithm>
 #include <atomic>
 #include <chrono>
-#include <cmath>
 #include <condition_variable>
-#include "libslic3r/TriangleMesh.hpp"
-#include "libslic3r/BoundingBox.hpp"
-#include "libslic3r/Point.hpp"
-#include "libslic3r/libslic3r.h"
-#include <exception>
 #include <cstddef>
-#include "libslic3r/Exception.hpp"
-#include <limits>
+#include <exception>
 #include <mutex>
-#include "slic3r/GUI/Widgets/ProgressDialog.hpp"
-#include <optional>
 #include <string>
 #include <thread>
-#include <utility>
 #include <vector>
+
 #include <wx/string.h>
 
-#include "libslic3r/MeshBoolean.hpp"
-#include "libslic3r/Model.hpp"
 #include "libslic3r/Format/bbs_3mf.hpp"
-#include "libslic3r/format.hpp"
+#include "libslic3r/MeshRepair.hpp"
+#include "libslic3r/Model.hpp"
 #include "libslic3r/Thread.hpp"
-#include "../GUI/I18N.hpp"
-#include "libslic3r/TriangleSelector.hpp"
-
-// Orca: This file provides utilities for repairing 3D model meshes using the CGAL library, handling mesh splitting, merging, and boolean operations.
+#include "slic3r/GUI/I18N.hpp"
+#include "slic3r/GUI/Widgets/ProgressDialog.hpp"
 
 namespace Slic3r {
 
 namespace {
 
-// Orca: Helper functions for analyzing mesh properties and transformations.
-
-bool is_not_3dimensional_part(const TriangleMesh &mesh)
+class RepairCanceledException : public std::exception
 {
-    // Orca: Determines if a mesh is degenerate or represents a non-3dimensional part by checking volume and bounding box dimensions.
-    if (mesh.its.indices.empty())
-        return true;
-
-    indexed_triangle_set tmp = mesh.its;
-    its_remove_degenerate_faces(tmp, true);
-    if (tmp.indices.empty())
-        return true;
-
-    const BoundingBoxf3 bbox = mesh.bounding_box();
-    const Vec3d size = bbox.size();
-    const double min_dim = std::min(size.x(), std::min(size.y(), size.z()));
-    const double max_dim = std::max(size.x(), std::max(size.y(), size.z()));
-    if (min_dim <= EPSILON)
-        return true;
-
-    const double volume = std::abs(its_volume(mesh.its));
-    const double bbox_volume = size.x() * size.y() * size.z();
-    if (volume <= EPSILON)
-        return true;
-
-    const double min_relative_thickness = 1e-6;
-    const double min_volume_ratio = 1e-6;
-    if (min_dim / max_dim <= min_relative_thickness)
-        return true;
-    if (bbox_volume > 0.0 && volume / bbox_volume <= min_volume_ratio)
-        return true;
-
-    return false;
-}
+public:
+    const char *what() const noexcept override { return "Model repair has been canceled"; }
+};
 
 } // namespace
 
-// Orca: Exception class for handling user-initiated cancellation of model repair operations.
-class RepairCanceledException : public std::exception {
-public:
-    const char* what() const noexcept override { return "Model repair has been canceled"; }
-};
-
-// Orca: Main function to repair model objects using CGAL, with progress dialog and cancellation support.
-// Returns false if fixing was canceled. fix_result contains error message if failed.
-bool fix_model_with_cgal_gui(ModelObject &model_object, int volume_idx, GUI::ProgressDialog &progress_dialog, const wxString &msg_header, std::string &fix_result, bool keep_painting)
+bool fix_model_with_cgal_gui(ModelObject &model_object, int volume_idx, GUI::ProgressDialog &progress_dialog, const wxString &msg_header, std::string &fix_result, bool keep_painting,
+                             bool *modified)
 {
-    // Hold SaveObjectGaurd to prevent backup manager from racing concurrent mesh mutations (use-after-free).
+    // Keeps the backup manager from reading a mesh while the worker replaces it.
     SaveObjectGaurd backup_gaurd(model_object);
 
-    // Orca: Synchronization primitives for progress updates between worker thread and GUI.
-    std::mutex mtx;
-    std::condition_variable condition;
-    struct Progress {
-        std::string message;
-        int         percent  = 0;
-        bool        updated  = false;
-    } progress;
+    std::vector<ModelVolume *> volumes;
+    if (volume_idx < 0)
+        volumes = model_object.volumes;
+    else if (std::size_t(volume_idx) < model_object.volumes.size())
+        volumes.push_back(model_object.volumes[volume_idx]);
 
+    std::mutex              mtx;
+    std::condition_variable condition;
+    struct Progress
+    {
+        std::string message;
+        int         percent = 0;
+        bool        updated = false;
+    } progress;
     std::atomic<bool> canceled = false;
     std::atomic<bool> finished = false;
+    bool              any_modified = false;
+    std::string       errors;
 
-    bool   success = false;
-    size_t ivolume = 0;
-
-    // Orca: Lambda for updating progress from worker thread.
-    auto on_progress = [&mtx, &condition, &ivolume, &model_object, &progress](const std::string &msg, unsigned prcnt) {
-        std::unique_lock<std::mutex> lock(mtx);
+    auto on_progress = [&mtx, &condition, &progress](const std::string &msg, int percent) {
+        std::lock_guard<std::mutex> lock(mtx);
         progress.message = msg;
-        const size_t total = std::max<size_t>(1, model_object.volumes.size());
-        progress.percent = int(std::floor((float(prcnt) + float(ivolume) * 100.f) / float(total)));
+        progress.percent = percent;
         progress.updated = true;
         condition.notify_all();
     };
 
-    // Orca: Worker thread that performs the actual model repair operations.
-    auto worker_thread = std::thread([&model_object, volume_idx, &ivolume, on_progress, &success, &canceled, &finished, &fix_result, keep_painting]() {
+    auto worker_thread = std::thread([&]() {
+        set_current_thread_name("cgal_fix_model");
         try {
-	        set_current_thread_name("cgal_fix_model");
+            for (std::size_t i = 0; i < volumes.size(); ++i) {
+                ModelVolume      *volume = volumes[i];
+                const std::string name   = volumes.size() > 1 ? volume->name : std::string();
+                const auto        report = [&](int percent) {
+                    if (canceled)
+                        throw RepairCanceledException();
+                    on_progress(name, int((100 * i + std::size_t(percent)) / volumes.size()));
+                };
+                report(0);
 
-            size_t start_volume = volume_idx == -1 ? 0 : size_t(volume_idx);
-            size_t end_volume   = volume_idx == -1 ? std::numeric_limits<size_t>::max() : size_t(volume_idx);
-
-            for (ivolume = start_volume; ivolume < model_object.volumes.size(); ++ivolume) {
-                if (volume_idx != -1 && ivolume > end_volume)
-                    break;
-                if (canceled)
-                    throw RepairCanceledException();
-
-                on_progress(_u8L("Repairing model object"), 10);
-
-                ModelVolume *volume = model_object.volumes[ivolume];
-
-                // Orca: Split splittable volumes into parts for individual processing.
-                size_t parts_count = 1;
-                if (volume->is_splittable()) {
-                    parts_count = volume->split(1, keep_painting);
-                    if (parts_count > 1) {
-                        const std::string msg = Slic3r::format(L("Split into %1% parts"), parts_count);
-                        on_progress(msg, 10);
-                    }
-                }
-
-                size_t part_end = std::min(ivolume + parts_count - 1, model_object.volumes.size() - 1);
-                if (volume_idx != -1)
-                    end_volume = part_end;
-
-                size_t removed_parts = 0;
-                for (size_t idx = part_end + 1; idx > ivolume; --idx) {
-                    const size_t part_idx = idx - 1;
-                    const ModelVolume *part_volume = model_object.volumes[part_idx];
-                    if (!is_not_3dimensional_part(part_volume->mesh()))
-                        continue;
-
-                    model_object.delete_volume(part_idx);
-                    ++removed_parts;
-                    if (part_end > 0)
-                        --part_end;
-                    else
-                        part_end = 0;
-                    if (volume_idx != -1)
-                        end_volume = part_end;
-                }
-
-                if (removed_parts >= parts_count) {
-                    ivolume = part_end;
-                    on_progress(_u8L("Repair finished"), 100);
-                    continue;
-                }
-
-                for (size_t part_idx = ivolume; part_idx <= part_end && part_idx < model_object.volumes.size(); ++part_idx) {
-                    ModelVolume *part_volume = model_object.volumes[part_idx];
-                    TriangleMesh mesh = part_volume->mesh();
-                    if (its_num_open_edges(mesh.its) != 0) {
-
-                        // Save painting for later remap
-                        const std::optional<TriangleSelector::SavedPainting> saved_painting = keep_painting ?
-                                                                                            part_volume->save_painting() :
-                                                                                            std::optional<TriangleSelector::SavedPainting>{};
-
-                        std::string error;
-                        if (!MeshBoolean::cgal::repair(mesh, nullptr, &error))
-                            throw Slic3r::RuntimeError(error.empty() ? _u8L("Repair failed") : error);
-
-                        part_volume->set_mesh(std::move(mesh));
-                        part_volume->calculate_convex_hull();
-                        part_volume->invalidate_convex_hull_2d();
-                        part_volume->set_new_unique_id();
-
-                        // Remap paint back
-                        part_volume->restore_painting(saved_painting);
-                    }
-                }
-
-                ivolume = part_end;
-
-                on_progress(_u8L("Repair finished"), 100);
+                MeshRepairStats stats;
+                std::string     error;
+                if (!volume->repair(keep_painting, &stats, &error, report))
+                    errors += (errors.empty() ? "" : "\n") + (volumes.size() > 1 ? volume->name + ": " : std::string()) + error;
+                any_modified = any_modified || stats.modified;
             }
-
-            model_object.invalidate_bounding_box();
-
-            if (ivolume > 0)
-                --ivolume;
-            on_progress(_u8L("Repair finished"), 100);
-            success = true;
-            finished = true;
-        } catch (RepairCanceledException &) {
+        } catch (const RepairCanceledException &) {
             canceled = true;
-            finished = true;
-            on_progress(_u8L("Repair canceled"), 100);
-        } catch (std::exception &ex) {
-            success = false;
-            finished = true;
-            fix_result = ex.what();
-            on_progress(ex.what(), 100);
+        } catch (const std::exception &ex) {
+            errors += (errors.empty() ? "" : "\n") + std::string(ex.what());
         }
+        // Volumes repaired before a cancel or an error keep their new mesh.
+        model_object.invalidate_bounding_box();
+        finished = true;
+        on_progress(_u8L("Repair finished"), 100);
     });
 
-    // Orca: Main GUI loop to update progress dialog and handle cancellation.
     while (!finished) {
         std::unique_lock<std::mutex> lock(mtx);
-        condition.wait_for(lock, std::chrono::milliseconds(250), [&progress]{ return progress.updated; });
-
-        // Decrease progress percent slightly to avoid auto-closing.
-        if (!progress_dialog.Update(progress.percent - 1, msg_header + _(progress.message)))
+        condition.wait_for(lock, std::chrono::milliseconds(250), [&progress] { return progress.updated; });
+        // One percent short of the maximum, so that the dialog does not close itself.
+        if (!progress_dialog.Update(std::max(0, progress.percent - 1), msg_header + wxString::FromUTF8(progress.message)))
             canceled = true;
         else
             progress_dialog.Fit();
-
         progress.updated = false;
     }
 
-    if (canceled) {
-        // Nothing to show.
-    } else if (success) {
-        fix_result.clear();
-    }
-
     if (worker_thread.joinable())
         worker_thread.join();
 
+    fix_result = canceled ? std::string() : errors;
+    if (modified)
+        *modified = any_modified;
     return !canceled;
 }
 

src/slic3r/Utils/FixModelByCgal.hpp

@@ -12,8 +12,9 @@ class Model;
 class ModelObject;
 class Print;
 
-// Return false if fixing was canceled. fix_result is empty on success.
-extern bool fix_model_with_cgal_gui(ModelObject &model_object, int volume_idx, GUI::ProgressDialog &progress_dlg, const wxString &msg_header, std::string &fix_result, bool keep_painting);
+// Return false if fixing was canceled. fix_result is empty on success; modified tells whether any mesh changed.
+extern bool fix_model_with_cgal_gui(ModelObject &model_object, int volume_idx, GUI::ProgressDialog &progress_dlg, const wxString &msg_header, std::string &fix_result, bool keep_painting,
+                                    bool *modified = nullptr);
 
 } // namespace Slic3r
 

tests/cli/CMakeLists.txt

@@ -31,6 +31,22 @@ set_tests_properties(cli_project_missing_keys PROPERTIES
     SKIP_RETURN_CODE 77
     TIMEOUT 900)
 
+add_test(NAME cli_arrange_rotations
+    COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/test_cli_arrange_rotations.sh $<TARGET_FILE:OrcaSlicer> ${ORCA_CLI_TEST_PYTHON}
+        ${CMAKE_SOURCE_DIR}/resources/profiles/BBL)
+set_tests_properties(cli_arrange_rotations PROPERTIES
+    LABELS "CLI;RequiresApp"
+    SKIP_RETURN_CODE 77
+    TIMEOUT 900)
+
+add_test(NAME cli_no_suitable_objects
+    COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/test_cli_no_suitable_objects.sh $<TARGET_FILE:OrcaSlicer> ${ORCA_CLI_TEST_PYTHON}
+        ${CMAKE_SOURCE_DIR}/resources/profiles/BBL)
+set_tests_properties(cli_no_suitable_objects PROPERTIES
+    LABELS "CLI;RequiresApp"
+    SKIP_RETURN_CODE 77
+    TIMEOUT 900)
+
 add_test(NAME cli_malformed_input
     COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/test_cli_malformed_input.sh $<TARGET_FILE:OrcaSlicer> ${ORCA_CLI_TEST_PYTHON})
 set_tests_properties(cli_malformed_input PROPERTIES

tests/cli/test_cli_arrange_rotations.sh

@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+# End-to-end check of the CLI's arrange rotation policy.
+#
+# Arrange is translate-only unless --allow-rotations is passed, so a bar that fits the bed only
+# diagonally is not placed and the plate ends up with nothing fully inside the print volume. The
+# run must then say that rotations were off, on stderr as well as in result.json, because
+# result.json is written on Linux only. Passing the flag must place the same bar and slice it, and
+# an object that fits axis-aligned must be unaffected by the default.
+#
+# usage: test_cli_arrange_rotations.sh <orca-slicer binary> <python3> <resources/profiles/BBL>
+set -u
+
+BIN="${1:-}"
+PY="${2:-python3}"
+PROFILES="${3:-}"
+# 77 is the test's SKIP_RETURN_CODE.
+[ -x "$BIN" ] || { echo "SKIP: orca-slicer binary not found: $BIN"; exit 77; }
+[ -d "$PROFILES" ] || { echo "FAIL: profiles directory not found: $PROFILES"; exit 1; }
+
+WORK="$(mktemp -d "${TMPDIR:-/tmp}/orca-cli-arrange-rotations.XXXXXX")"
+trap 'rm -rf "$WORK"' EXIT
+
+# box <file> <x> <y> <z>: an ASCII STL box, so the test needs no fixture.
+box() {
+    "$PY" - "$@" <<'EOF'
+import sys
+
+out, sx, sy, sz = sys.argv[1], float(sys.argv[2]), float(sys.argv[3]), float(sys.argv[4])
+v = [(x, y, z) for z in (0, sz) for y in (0, sy) for x in (0, sx)]
+with open(out, "w") as f:
+    f.write("solid box\n")
+    for a, b, c, d in ((0, 2, 3, 1), (4, 5, 7, 6), (0, 1, 5, 4), (2, 6, 7, 3), (0, 4, 6, 2), (1, 3, 7, 5)):
+        for tri in ((v[a], v[b], v[c]), (v[a], v[c], v[d])):
+            f.write("facet normal 0 0 0\nouter loop\n")
+            for p in tri:
+                f.write("vertex %g %g %g\n" % p)
+            f.write("endloop\nendfacet\n")
+    f.write("endsolid box\n")
+EOF
+}
+
+# Longer than the 256 mm bed edge, shorter than its 362 mm diagonal: it fits only turned.
+box "$WORK/bar.stl" 300 10 5
+# Fits axis-aligned, so the default must not change anything for it.
+box "$WORK/cube.stl" 10 10 10
+
+# slice <tag> <input> [option...] -> $WORK/<tag>/{rc,stdout,stderr,result.json}
+slice() {
+    local out="$WORK/$1" input="$2"; shift 2
+    mkdir -p "$out"
+    timeout 300 "$BIN" --datadir "$out/datadir" \
+        --load-settings "$PROFILES/machine/Bambu Lab X1 Carbon 0.4 nozzle.json;$PROFILES/process/0.20mm Standard @BBL X1C.json" \
+        --load-defaultfila "$@" --slice 0 --outputdir "$out" "$input" \
+        > "$out/stdout" 2> "$out/stderr"
+    echo "$?" > "$out/rc"
+}
+
+# exit_code <tag>: the CLI's negative code as the shell saw it, e.g. -50 arrives as 206.
+exit_code() { "$PY" -c "import sys; rc = int(open(sys.argv[1]).read()); print(rc - 256 if rc > 127 else rc)" "$WORK/$1/rc"; }
+
+fail() { echo "FAIL: $*"; exit 1; }
+
+# 1. Default: no flag, so no rotations, so the bar does not fit and the reason names rotation.
+slice default "$WORK/bar.stl"
+[ "$(exit_code default)" = "-50" ] || fail "default: expected -50, got $(exit_code default)"
+grep -q "Arrange ran without rotations" "$WORK/default/stderr" \
+    || fail "default: stderr does not mention rotations: $(cat "$WORK/default/stderr")"
+"$PY" - "$WORK/default/result.json" <<'EOF' || exit 1
+import json, sys
+
+result = json.load(open(sys.argv[1]))
+if result["return_code"] != -50:
+    sys.exit("FAIL: result.json return_code %s, expected -50" % result["return_code"])
+if "Arrange ran without rotations" not in result["error_string"]:
+    sys.exit("FAIL: result.json error_string does not mention rotations: %s" % result["error_string"])
+EOF
+
+# 2. The flag is coBool, so it takes no value: it must place the same bar and slice it.
+slice rotations "$WORK/bar.stl" --allow-rotations
+[ "$(exit_code rotations)" = "0" ] || fail "--allow-rotations: expected 0, got $(exit_code rotations); $(tail -n 5 "$WORK/rotations/stdout")"
+[ -s "$WORK/rotations/plate_1.gcode" ] || fail "--allow-rotations: no g-code written"
+
+# 3. An object that fits axis-aligned is unaffected by the default, and says nothing about rotation.
+slice cube "$WORK/cube.stl"
+[ "$(exit_code cube)" = "0" ] || fail "cube: expected 0, got $(exit_code cube); $(tail -n 5 "$WORK/cube/stdout")"
+[ -s "$WORK/cube/plate_1.gcode" ] || fail "cube: no g-code written"
+grep -q "Arrange ran without rotations" "$WORK/cube/stderr" && fail "cube: unexpected rotation message on a successful run"
+
+echo "PASS: arrange rotation default, its failure message, and the opt-in flag"

tests/cli/test_cli_no_suitable_objects.sh

@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+# The reason recorded for CLI_NO_SUITABLE_OBJECTS (-50) has to fit the input the CLI was given.
+# Any input format is arranged and sliced, so an object larger than the bed empties the plate just
+# as a 3mf with an empty plate does, and the recorded reason must not send such a caller off to
+# inspect a 3mf or an upload that is not part of their run.
+#
+# usage: test_cli_no_suitable_objects.sh <orca-slicer binary> <python3> <resources/profiles/BBL>
+set -u
+
+BIN="${1:-}"
+PY="${2:-python3}"
+PROFILES="${3:-}"
+# 77 is the test's SKIP_RETURN_CODE.
+[ -x "$BIN" ] || { echo "SKIP: orca-slicer binary not found: $BIN"; exit 77; }
+[ -d "$PROFILES" ] || { echo "FAIL: profiles directory not found: $PROFILES"; exit 1; }
+
+WORK="$(mktemp -d "${TMPDIR:-/tmp}/orca-cli-no-suitable-objects.XXXXXX")"
+trap 'rm -rf "$WORK"' EXIT
+
+# box <file> <x> <y> <z>: an ASCII STL box, so the test needs no fixture.
+box() {
+    "$PY" - "$@" <<'EOF'
+import sys
+
+out, sx, sy, sz = sys.argv[1], float(sys.argv[2]), float(sys.argv[3]), float(sys.argv[4])
+v = [(x, y, z) for z in (0, sz) for y in (0, sy) for x in (0, sx)]
+with open(out, "w") as f:
+    f.write("solid box\n")
+    for a, b, c, d in ((0, 2, 3, 1), (4, 5, 7, 6), (0, 1, 5, 4), (2, 6, 7, 3), (0, 4, 6, 2), (1, 3, 7, 5)):
+        for tri in ((v[a], v[b], v[c]), (v[a], v[c], v[d])):
+            f.write("facet normal 0 0 0\nouter loop\n")
+            for p in tri:
+                f.write("vertex %g %g %g\n" % p)
+            f.write("endloop\nendfacet\n")
+    f.write("endsolid box\n")
+EOF
+}
+
+# Wider than the 256 mm bed and wider than its 362 mm diagonal, so no placement can fit it.
+box "$WORK/slab.stl" 400 400 5
+# Fits, so the run must succeed: proves the harness itself is sound.
+box "$WORK/cube.stl" 10 10 10
+
+# slice <tag> <input> [option...] -> $WORK/<tag>/{rc,stdout,stderr,result.json}
+slice() {
+    local out="$WORK/$1" input="$2"; shift 2
+    mkdir -p "$out"
+    timeout 300 "$BIN" --datadir "$out/datadir" \
+        --load-settings "$PROFILES/machine/Bambu Lab X1 Carbon 0.4 nozzle.json;$PROFILES/process/0.20mm Standard @BBL X1C.json" \
+        "$@" --slice 0 --outputdir "$out" "$input" \
+        > "$out/stdout" 2> "$out/stderr"
+    echo "$?" > "$out/rc"
+}
+
+# exit_code <tag>: the CLI's negative code as the shell saw it, e.g. -50 arrives as 206.
+exit_code() { "$PY" -c "import sys; rc = int(open(sys.argv[1]).read()); print(rc - 256 if rc > 127 else rc)" "$WORK/$1/rc"; }
+
+fail() { echo "FAIL: $*"; exit 1; }
+
+# --allow-rotations keeps this on the generic reason: a translate-only arrange has its own,
+# more specific one. The slab is wider than the 362 mm bed diagonal, so rotation cannot place it.
+slice slab "$WORK/slab.stl" --allow-rotations
+[ "$(exit_code slab)" = "-50" ] || fail "slab: expected -50, got $(exit_code slab); $(tail -n 5 "$WORK/slab/stdout")"
+"$PY" - "$WORK/slab/result.json" <<'EOF' || exit 1
+import json, sys
+
+result = json.load(open(sys.argv[1]))
+if result["return_code"] != -50:
+    sys.exit("FAIL: result.json return_code %s, expected -50" % result["return_code"])
+reason = result["error_string"]
+if not reason.strip():
+    sys.exit("FAIL: result.json carries no error_string")
+# The run was handed an STL and asked for g-code: neither a 3mf nor an upload exists to check.
+for word in ("3mf", "3MF", "upload"):
+    if word in reason:
+        sys.exit("FAIL: error_string mentions %r for an STL run: %s" % (word, reason))
+EOF
+
+slice cube "$WORK/cube.stl"
+[ "$(exit_code cube)" = "0" ] || fail "cube: expected 0, got $(exit_code cube); $(tail -n 5 "$WORK/cube/stdout")"
+[ -s "$WORK/cube/plate_1.gcode" ] || fail "cube: no g-code written"
+
+echo "PASS: the no-suitable-objects reason fits a non-3mf run"

tests/data/surface_model_geometric_set.step

@@ -0,0 +1,35 @@
+ISO-10303-21;
+HEADER;
+FILE_DESCRIPTION((''),'2;1');
+FILE_NAME('surface_model_geometric_set','2026-10-12T00:00:00',(''),(''),'','','');
+FILE_SCHEMA(('CONFIG_CONTROL_DESIGN'));
+ENDSEC;
+DATA;
+#1=APPLICATION_CONTEXT('configuration controlled 3d designs of mechanical parts and assemblies');
+#2=APPLICATION_PROTOCOL_DEFINITION('international standard','config_control_design',1994,#1);
+#3=MECHANICAL_CONTEXT('',#1,'mechanical');
+#4=PRODUCT('surfaces','surfaces','',(#3));
+#5=PRODUCT_DEFINITION_FORMATION_WITH_SPECIFIED_SOURCE('','',#4,.NOT_KNOWN.);
+#6=DESIGN_CONTEXT('',#1,'design');
+#7=PRODUCT_DEFINITION('','',#5,#6);
+#8=PRODUCT_DEFINITION_SHAPE('','',#7);
+#9=SHAPE_DEFINITION_REPRESENTATION(#8,#20);
+#10=(LENGTH_UNIT()NAMED_UNIT(*)SI_UNIT(.MILLI.,.METRE.));
+#11=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));
+#12=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());
+#13=UNCERTAINTY_MEASURE_WITH_UNIT(LENGTH_MEASURE(1.E-6),#10,'distance_accuracy_value','');
+#14=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNCERTAINTY_ASSIGNED_CONTEXT((#13))GLOBAL_UNIT_ASSIGNED_CONTEXT((#10,#11,#12))REPRESENTATION_CONTEXT('',''));
+#15=CARTESIAN_POINT('',(0.,0.,0.));
+#16=DIRECTION('',(0.,0.,1.));
+#17=DIRECTION('',(1.,0.,0.));
+#18=AXIS2_PLACEMENT_3D('',#15,#16,#17);
+#19=GEOMETRIC_SET('',(#30,#40));
+#20=GEOMETRICALLY_BOUNDED_SURFACE_SHAPE_REPRESENTATION('',(#18,#19),#14);
+#30=RECTANGULAR_TRIMMED_SURFACE('',#31,0.,10.,0.,10.,.T.,.T.);
+#31=PLANE('',#18);
+#40=RECTANGULAR_TRIMMED_SURFACE('',#41,0.,10.,0.,10.,.T.,.T.);
+#41=PLANE('',#42);
+#42=AXIS2_PLACEMENT_3D('',#43,#16,#17);
+#43=CARTESIAN_POINT('',(0.,0.,10.));
+ENDSEC;
+END-ISO-10303-21;

tests/fff_print/test_gcodeprocessor.cpp

@@ -178,6 +178,61 @@ bool is_block_move(const GCodeProcessorResult::MoveVertex &move)
 
 } // namespace
 
+TEST_CASE("Loaded manual tool change comments switch subsequent moves when enabled", "[GCodeProcessor][Regression]")
+{
+    const bool manual_filament_change = GENERATE(false, true);
+    CAPTURE(manual_filament_change);
+    const DynamicPrintConfig config = Test::multifilament_config(2, {
+        { "gcode_flavor",           "marlin" },
+        { "filament_type",          "PLA;PETG" },
+        { "manual_filament_change", manual_filament_change },
+    });
+    const bool was_bbl_printer = GCodeProcessor::s_IsBBLPrinter;
+    const ScopeGuard restore_bbl_printer([was_bbl_printer] { GCodeProcessor::s_IsBBLPrinter = was_bbl_printer; });
+    GCodeProcessor::s_IsBBLPrinter = false;
+
+    ScopedTemporaryFile temp(".gcode");
+    {
+        std::ofstream out(temp.string());
+        REQUIRE(out.is_open());
+        out << "; generated by OrcaSlicer\n"
+            << "G90\nM83\nT0\n"
+            << "G1 X10 Y10 Z0.2 F3000\n"
+            << "G1 X20 E1\n"
+            << "; MANUAL_TOOL_CHANGE T1\n"
+            << "G1 X30\nG1 X40 E1\nG1 X50\nG1 X60 E1\n";
+        // Let process_file load the embedded DynamicPrintConfig, as the standalone viewer does.
+        out << "; CONFIG_BLOCK_START\n";
+        for (const std::string &key : config.keys())
+            out << "; " << key << " = " << config.opt_serialize(key) << '\n';
+        out << "; CONFIG_BLOCK_END\n";
+        REQUIRE(out.good());
+    }
+
+    GCodeProcessor processor;
+    processor.process_file(temp.string());
+    const auto &result = processor.get_result();
+    REQUIRE(result.filaments_count == 2);
+
+    constexpr unsigned int tool_change_line = 7;
+    size_t before = 0;
+    size_t after = 0;
+    for (const auto &move : result.moves) {
+        if (!is_block_move(move))
+            continue;
+        CAPTURE(move.gcode_id, move.type);
+        if (move.gcode_id < tool_change_line) {
+            ++before;
+            CHECK(move.extruder_id == 0);
+        } else if (move.gcode_id > tool_change_line) {
+            ++after;
+            CHECK(move.extruder_id == (manual_filament_change ? 1 : 0));
+        }
+    }
+    REQUIRE(before > 0);
+    REQUIRE(after > 0);
+}
+
 TEST_CASE("Actual speed moves are inserted on their block's segment just before its move", "[GCodeProcessor]")
 {
     // 60 squares take several planner passes, which remap the blocks kept between passes.

tests/fff_print/test_gcodewriter.cpp

@@ -1748,3 +1748,29 @@ TEST_CASE("Percent accelerations resolve against the option they are a percentag
         REQUIRE(accelerations_by_role[role_name] == std::set<int>{ value });
     }
 }
+
+TEST_CASE("Initial filament start G-code tolerates a list shorter than the filament count", "[GCodeWriter]")
+{
+    // Two filaments but only one filament_start_gcode entry, and the only object prints on
+    // filament 2, so the BBL export starts on a filament past the end of the list.
+    DynamicPrintConfig config = multifilament_config(2);
+    config.set_key_value("filament_start_gcode", new ConfigOptionStrings({"; filament start"}));
+
+    Model model;
+    auto *obj = model.add_object();
+    obj->add_volume(cube(20));
+    obj->add_instance();
+    obj->config.set_key_value("extruder", new ConfigOptionInt(2));
+
+    Print print;
+    print.is_BBL_printer() = true;
+    arrange_objects_on_test_bed(model, config);
+    for (auto *mo : model.objects) {
+        mo->ensure_on_bed();
+        print.auto_assign_extruders(mo);
+    }
+    print.apply(model, config);
+    print.validate();
+
+    REQUIRE_NOTHROW(Slic3r::Test::gcode(print));
+}

tests/fff_print/test_helpers.cpp

@@ -223,7 +223,10 @@ DynamicPrintConfig multifilament_config(unsigned int filaments, std::initializer
 	// These are read by filament id during export but absent from filament_option_keys(),
 	// so set_num_filaments leaves them size 1; size them too, else out-of-range access.
 	const auto &defaults = FullPrintConfig::defaults();
-	for (const char *key : { "filament_type", "filament_vendor", "filament_start_gcode" })
+	for (const char *key : { "filament_type", "filament_vendor", "filament_start_gcode", "filament_change_length", "filament_change_length_nc",
+	                         "filament_ramming_travel_time", "filament_ramming_travel_time_nc",
+	                         "filament_ramming_volumetric_speed", "filament_ramming_volumetric_speed_nc",
+	                         "nozzle_temperature", "nozzle_temperature_initial_layer" })
 		static_cast<ConfigOptionVectorBase *>(config.option(key, true))->resize(filaments, defaults.option(key));
 
 	// flush_volumes_matrix must be sized filaments*filaments or export rejects it.

tests/fff_print/test_multifilament.cpp

@@ -315,6 +315,79 @@ TEST_CASE("Per-object wall filament override is honored", "[MultiFilament]")
     CHECK(tools_for_role(gcode, "infill")    == std::set<int>{ 0 }); // infill not overridden: stays on F1
 }
 
+// FanMover's guard against splitting a G1 inside custom gcode keys off the ";_FAN_MOVER_SKIP_START/END"
+// markers GCode::set_extruder() must emit around change_filament_gcode's output. Direct
+// toolchanges and Type2's wipe-tower toolchange (append_tcr2() calls set_extruder()) both go
+// through it; Type1's wipe-tower toolchange (WipeTowerIntegration::append_tcr(), append_tcr2's only
+// sibling caller of change_filament_gcode) needs the same bracketing of its own.
+TEST_CASE("Toolchange gcode is bracketed against FanMover splitting its moves", "[MultiFilament]")
+{
+    const std::string custom_gcode = "; fan full\nM106 P1 S255\nM400 S3\nG1 X77 F5000\nG1 X91 F3000\n";
+
+    // "direct": no prime tower, GCode::set_extruder() runs the toolchange. By-object sequencing
+    // with a per-object filament override is what makes one happen at all without a tower.
+    // "type1": a Type1 prime tower routes the toolchange through WipeTowerIntegration::append_tcr()
+    // instead (append_tcr2, Type2's equivalent, itself calls set_extruder() - so Type2 needs no
+    // separate case here).
+    const std::string path = GENERATE(as<std::string>{}, "direct", "type1");
+    CAPTURE(path);
+
+    std::string gcode_str;
+    if (path == "direct") {
+        const std::vector<std::vector<Slic3r::ConfigBase::SetDeserializeItem>> per_object_overrides = {
+            {}, { { "outer_wall_filament_id", "2" }, { "inner_wall_filament_id", "2" } }
+        };
+        DynamicPrintConfig config = multifilament_config(2, {
+            { "skirt_loops",           0 },
+            { "brim_type",             "no_brim" },
+            { "print_sequence",        "by object" },
+            { "change_filament_gcode", custom_gcode },
+            { "fan_speedup_time",      0.5 },
+            { "fan_kickstart",         0.1 },
+        });
+        gcode_str = slice_with_object_overrides({ cube(20), cube(20) }, config, per_object_overrides);
+    } else {
+        const std::vector<std::vector<Slic3r::ConfigBase::SetDeserializeItem>> per_object_overrides = {
+            { { "extruder", "1" } }, { { "extruder", "2" } }
+        };
+        DynamicPrintConfig config = multifilament_config(2, {
+            { "change_filament_gcode", custom_gcode },
+            { "fan_speedup_time",      0.5 },
+            { "fan_kickstart",         0.1 },
+            { "enable_prime_tower",    true },
+            { "wipe_tower_type",       "type1" },
+            { "prime_tower_width",     35 },
+            { "wipe_tower_x",          120 },
+            { "wipe_tower_y",          120 },
+            { "printable_area",        "0x0,200x0,200x200,0x200" },
+            { "skirt_loops",           0 },
+            { "brim_type",             "no_brim" },
+        });
+        gcode_str = slice_with_object_overrides({ cube(20), cube(20) }, config, per_object_overrides);
+    }
+
+    // The resolved-settings config footer echoes "change_filament_gcode = ..." with its value
+    // escaped, so drop it before counting or its own copy of "G1 X77 F5000" is miscounted.
+    const size_t footer_start = gcode_str.find("; CONFIG_BLOCK_START");
+    REQUIRE(footer_start != std::string::npos);
+    gcode_str.erase(footer_start);
+
+    auto count_occurrences = [](const std::string &haystack, const std::string &needle) {
+        size_t count = 0, pos = 0;
+        while ((pos = haystack.find(needle, pos)) != std::string::npos) {
+            ++count;
+            pos += needle.size();
+        }
+        return count;
+    };
+    const size_t total_waypoints = count_occurrences(gcode_str, "G1 X77 F5000");
+    const size_t bracketed       = count_occurrences(gcode_str, "M400 S3\nG1 X77 F5000");
+    REQUIRE(total_waypoints > 0);
+    CHECK(bracketed == total_waypoints);
+    // FanMover drops its own markers; only the start-of-print toolchange, which it never processes, keeps them.
+    CHECK(count_occurrences(gcode_str, ";_FAN_MOVER_SKIP_START") <= 1);
+}
+
 // With wait_for_temp_on_wipe_tower the blocking M109 moves from right after the Tn command to
 // a stop point parked beside the wipe tower (heat-up drool falls next to the tower, not onto
 // its top): tagged with _WAIT_FOR_TEMP_ON_WIPE_TOWER, after the toolchange and before the

tests/fff_print/test_print.cpp

@@ -43,6 +43,7 @@
 #include "libslic3r/GCode/GCodeProcessor.hpp"
 #include "libslic3r/Exception.hpp"
 #include "libslic3r/LifecycleEvents.hpp"
+#include "libslic3r/Utils.hpp"
 
 #include "test_helpers.hpp"
 #include "test_utils.hpp"
@@ -156,6 +157,81 @@ SCENARIO("Changing the number of solid shell layers does not make all surfaces i
     }
 }
 
+// Two copies of one object share a single slice. When a copy that has sliced itself becomes identical to an
+// earlier object, it keeps its own layers while that object slices and only then takes the shared layers over.
+TEST_CASE("An object that starts sharing another object's slices keeps its own layers until it takes them over", "[Print][Regression]")
+{
+    DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
+    config.set_deserialize_strict({
+        { "layer_height",               0.2 },
+        { "initial_layer_print_height", 0.2 },
+        { "raft_layers",                1 }, // each object gets support layers of its own
+        { "sparse_infill_density",      "20%" }, // object_a's override below differs from this
+    });
+    // Activates the slicing-pipeline hook installed for the second slice below.
+    config.set_key_value("slicing_pipeline_plugin", new ConfigOptionStrings({"probe"}));
+
+    Print print;
+    Model model;
+    init_print({cube(20)}, print, model, config);
+    ModelObject *object_a = model.objects.front();
+    // add_object() gives the copy extruder 1, and objects only share slices when their configs match.
+    object_a->config.set_key_value("extruder", new ConfigOptionInt(1));
+    ModelObject *object_b = model.add_object(*object_a); // shares object_a's mesh
+    for (ModelInstance *instance : object_b->instances)
+        instance->set_offset(instance->get_offset() + Vec3d(40., 0., 0.));
+    // A per-object override makes the objects differ, so each slices itself.
+    object_a->config.set_key_value("sparse_infill_density", new ConfigOptionPercent(40));
+
+    print.apply(model, config);
+    print.process();
+    REQUIRE(print.objects().size() == 2);
+    // The non-const accessors hand out the layer vectors themselves, which the checks below compare.
+    PrintObject *print_b = print.get_object(1);
+    REQUIRE(print_b->model_object()->id() == object_b->id()); // Print slices its own copy of the model
+    REQUIRE(print_b->get_shared_object() == nullptr);
+    const LayerPtrs        own_layers         = print_b->layers();
+    const SupportLayerPtrs own_support_layers = print_b->support_layers();
+    REQUIRE(!own_layers.empty());
+    REQUIRE(!own_support_layers.empty());
+
+    // Without the override the objects are identical again: print_a redoes the steps the setting invalidated,
+    // and print_b shares it.
+    object_a->config.erase("sparse_infill_density");
+    print.apply(model, config);
+    REQUIRE(print.objects().size() == 2);
+    PrintObject *print_a = print.get_object(0);
+
+    // Erasing the override invalidates print_a's posPrepareInfill and the steps after it. Its hook is the first one
+    // print_a fires, and it runs after print_b starts sharing but before print_b takes the shared layers over.
+    bool hook_fired          = false;
+    bool shared_while_a_runs = false;
+    bool kept_layers         = false;
+    bool kept_support_layers = false;
+    {
+        Print::set_slicing_pipeline_hook_fn([&](Print &, const PrintObject *object, SlicingPipelineStepPlugin) {
+            if (object != print_a || hook_fired)
+                return;
+            hook_fired          = true;
+            shared_while_a_runs = print_b->get_shared_object() == print_a;
+            kept_layers         = print_b->layers() == own_layers;
+            kept_support_layers = print_b->support_layers() == own_support_layers;
+        });
+        const ScopeGuard reset_hook([] { Print::set_slicing_pipeline_hook_fn(nullptr); });
+        print.process();
+    }
+
+    REQUIRE(hook_fired);
+    CHECK(print.objects()[1] == print_b);
+    CHECK(shared_while_a_runs);
+    CHECK(kept_layers);
+    CHECK(kept_support_layers);
+    CHECK(print_b->get_shared_object() == print_a);
+    REQUIRE(!print_a->layers().empty());
+    CHECK(print_b->layers() == print_a->layers());
+    CHECK(print_b->support_layers() == print_a->support_layers());
+}
+
 // ---------------------------------------------------------------------------
 // Print::validate() warning collection
 //

tests/libslic3r/CMakeLists.txt

@@ -53,6 +53,7 @@ add_executable(${_TEST_NAME}_tests
     test_stl.cpp
     test_triangle_selector.cpp
     test_meshboolean.cpp
+    test_mesh_repair.cpp
     test_trianglemesh_slicer.cpp
     test_marchingsquares.cpp
     test_lay_on_face.cpp

tests/libslic3r/test_mesh_repair.cpp

@@ -0,0 +1,255 @@
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
+
+#include <algorithm>
+#include <cmath>
+#include <cstddef>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <libslic3r/MeshBoolean.hpp>
+#include <libslic3r/MeshRepair.hpp>
+#include <libslic3r/Point.hpp>
+#include <libslic3r/libslic3r.h>
+#include <libslic3r/TriangleMesh.hpp>
+
+using namespace Slic3r;
+using Catch::Matchers::WithinRel;
+
+namespace {
+
+indexed_triangle_set cube(double size, const Vec3d &offset = Vec3d::Zero())
+{
+    TriangleMesh mesh = make_cube(size, size, size);
+    mesh.translate(offset.cast<float>());
+    return mesh.its;
+}
+
+indexed_triangle_set merged(const std::vector<indexed_triangle_set> &parts)
+{
+    indexed_triangle_set out;
+    for (const indexed_triangle_set &part : parts)
+        its_merge(out, part);
+    return out;
+}
+
+// Every triangle with its own three vertices, as some exporters write meshes.
+indexed_triangle_set soup(const indexed_triangle_set &its)
+{
+    indexed_triangle_set out;
+    for (const stl_triangle_vertex_indices &f : its.indices) {
+        const int first = int(out.vertices.size());
+        for (int k = 0; k < 3; ++k)
+            out.vertices.push_back(its.vertices[f[k]]);
+        out.indices.emplace_back(first, first + 1, first + 2);
+    }
+    return out;
+}
+
+double regular_polygon_area(int sides, double radius) { return 0.5 * sides * radius * radius * std::sin(2. * PI / sides); }
+
+// Closed by vertex indices, outward oriented and free of self-intersections.
+void check_solid(const TriangleMesh &mesh, double volume)
+{
+    CHECK(its_num_open_edges(mesh.its) == 0);
+    CHECK_THAT(its_volume(mesh.its), WithinRel(volume, 1e-4));
+    CHECK_FALSE(MeshBoolean::cgal::does_self_intersect(mesh));
+}
+
+} // namespace
+
+TEST_CASE("A triangle soup repairs into the solid it describes", "[MeshRepair]")
+{
+    TriangleMesh mesh(soup(cube(20.)));
+    MeshRepairStats stats;
+    REQUIRE(repair_mesh(mesh, &stats));
+    CHECK(stats.modified);
+    check_solid(mesh, 20. * 20. * 20.);
+    CHECK(mesh.its.vertices.size() == 8);
+}
+
+TEST_CASE("Flipped triangles take the orientation of their neighbours", "[MeshRepair]")
+{
+    indexed_triangle_set its = cube(20.);
+    std::swap(its.indices[1][1], its.indices[1][2]);
+    std::swap(its.indices[5][1], its.indices[5][2]);
+    TriangleMesh mesh(std::move(its));
+    REQUIRE(repair_mesh(mesh));
+    check_solid(mesh, 20. * 20. * 20.);
+}
+
+TEST_CASE("An inside-out mesh is turned outward", "[MeshRepair]")
+{
+    indexed_triangle_set its = cube(20.);
+    its_flip_triangles(its);
+    TriangleMesh mesh(std::move(its));
+    REQUIRE(repair_mesh(mesh));
+    check_solid(mesh, 20. * 20. * 20.);
+}
+
+TEST_CASE("Holes are filled", "[MeshRepair]")
+{
+    indexed_triangle_set its = cube(20.);
+    its.indices.erase(its.indices.begin(), its.indices.begin() + 3);
+    TriangleMesh mesh(std::move(its));
+    MeshRepairStats stats;
+    REQUIRE(repair_mesh(mesh, &stats));
+    CHECK(stats.filled_holes > 0);
+    check_solid(mesh, 20. * 20. * 20.);
+}
+
+TEST_CASE("Cracks between triangles that should share corners are closed", "[MeshRepair]")
+{
+    indexed_triangle_set its = soup(cube(20.));
+    // Shift the corners of two triangles by far less than a micron, as float rounding in an exporter would.
+    for (std::size_t v = 0; v < 6; ++v)
+        its.vertices[v] += Vec3f(1e-5f, -1e-5f, 1e-5f);
+    TriangleMesh mesh(std::move(its));
+    MeshRepairStats stats;
+    REQUIRE(repair_mesh(mesh, &stats));
+    CHECK(stats.welded_vertices > 0);
+    check_solid(mesh, 20. * 20. * 20.);
+}
+
+TEST_CASE("A T-junction is closed", "[MeshRepair]")
+{
+    // The top of the cube is split at the middle of its front edge, which the front side does not share.
+    indexed_triangle_set its;
+    its.vertices = {{0, 0, 0}, {20, 0, 0}, {20, 20, 0}, {0, 20, 0}, {0, 0, 20}, {20, 0, 20}, {20, 20, 20}, {0, 20, 20}, {10, 0, 20}};
+    its.indices  = {{0, 2, 1}, {0, 3, 2}, {4, 8, 7}, {8, 6, 7}, {8, 5, 6}, {0, 1, 5}, {0, 5, 4},
+                    {1, 2, 6}, {1, 6, 5}, {2, 3, 7}, {2, 7, 6}, {3, 0, 4}, {3, 4, 7}};
+    TriangleMesh mesh(std::move(its));
+    REQUIRE(repair_mesh(mesh));
+    check_solid(mesh, 20. * 20. * 20.);
+}
+
+TEST_CASE("Crossing shells stay separate parts and are made solid", "[MeshRepair]")
+{
+    indexed_triangle_set inside_out = cube(20., {10., 10., 10.});
+    its_flip_triangles(inside_out);
+    TriangleMesh mesh(merged({cube(20.), inside_out}));
+    MeshRepairStats stats;
+    REQUIRE(repair_mesh(mesh, &stats));
+    CHECK(stats.reversed_shells == 1);
+    CHECK(its_num_open_edges(mesh.its) == 0);
+    CHECK_THAT(its_volume(mesh.its), WithinRel(2 * 8000., 1e-4));
+    CHECK(mesh.split().size() == 2);
+}
+
+TEST_CASE("Solids touching face to face in a soup lose the wall between them", "[MeshRepair]")
+{
+    // The mirrored copy shares the wall at x = 10 with exactly the same triangles, reversed.
+    TriangleMesh right = make_cube(10., 10., 10.);
+    right.mirror(X);
+    right.translate(20.f, 0.f, 0.f);
+    TriangleMesh mesh(soup(merged({cube(10.), right.its})));
+    REQUIRE(repair_mesh(mesh));
+    check_solid(mesh, 2 * 1000.);
+    CHECK(mesh.split().size() == 1);
+}
+
+TEST_CASE("A shell inside a solid follows the nonzero winding rule of slicing", "[MeshRepair]")
+{
+    SECTION("Oriented like the outer shell, it adds nothing and is removed")
+    {
+        TriangleMesh mesh(merged({cube(20.), cube(10., {5., 5., 5.})}));
+        REQUIRE(repair_mesh(mesh));
+        check_solid(mesh, 8000.);
+        CHECK(mesh.its.indices.size() == 12);
+    }
+    SECTION("Oriented inward, it is a cavity and stays")
+    {
+        indexed_triangle_set cavity = cube(10., {5., 5., 5.});
+        its_flip_triangles(cavity);
+        TriangleMesh mesh(merged({cube(20.), cavity}));
+        MeshRepairStats stats;
+        REQUIRE(repair_mesh(mesh, &stats));
+        CHECK_FALSE(stats.modified);
+        CHECK_THAT(its_volume(mesh.its), WithinRel(8000. - 1000., 1e-4));
+    }
+}
+
+TEST_CASE("A pipe missing its end caps gets annular caps", "[MeshRepair]")
+{
+    const int    n = 64;
+    const double h = 20., r_out = 10., r_in = 7.;
+    indexed_triangle_set its;
+    for (const double r : {r_out, r_in})
+        for (int k = 0; k < n; ++k) {
+            const double a = 2. * PI * k / n;
+            its.vertices.emplace_back(float(r * std::cos(a)), float(r * std::sin(a)), 0.f);
+            its.vertices.emplace_back(float(r * std::cos(a)), float(r * std::sin(a)), float(h));
+        }
+    for (int k = 0; k < n; ++k) {
+        const int a0 = 2 * k, b0 = a0 + 1, a1 = 2 * ((k + 1) % n), b1 = a1 + 1;
+        its.indices.emplace_back(a0, a1, b1);
+        its.indices.emplace_back(a0, b1, b0);
+        its.indices.emplace_back(2 * n + a0, 2 * n + b1, 2 * n + a1);
+        its.indices.emplace_back(2 * n + a0, 2 * n + b0, 2 * n + b1);
+    }
+    TriangleMesh mesh(std::move(its));
+    REQUIRE(repair_mesh(mesh));
+    check_solid(mesh, h * (regular_polygon_area(n, r_out) - regular_polygon_area(n, r_in)));
+}
+
+TEST_CASE("A stray flat triangle is dropped", "[MeshRepair]")
+{
+    indexed_triangle_set its = cube(20.);
+    its.vertices.insert(its.vertices.end(), {{30, 0, 0}, {40, 0, 0}, {30, 10, 0}});
+    its.indices.emplace_back(8, 9, 10);
+    TriangleMesh mesh(std::move(its));
+    MeshRepairStats stats;
+    REQUIRE(repair_mesh(mesh, &stats));
+    CHECK(stats.removed_shells == 1);
+    check_solid(mesh, 8000.);
+}
+
+TEST_CASE("A two-sided export keeps one side of each triangle", "[MeshRepair]")
+{
+    indexed_triangle_set back = cube(20.);
+    its_flip_triangles(back);
+    TriangleMesh mesh(soup(merged({cube(20.), back})));
+    REQUIRE(repair_mesh(mesh));
+    check_solid(mesh, 8000.);
+}
+
+TEST_CASE("A valid mesh is left untouched", "[MeshRepair]")
+{
+    TriangleMesh       mesh = make_sphere(10., 2. * PI / 36.);
+    const TriangleMesh original = mesh;
+    MeshRepairStats    stats;
+    REQUIRE(repair_mesh(mesh, &stats));
+    CHECK_FALSE(stats.modified);
+    CHECK(mesh.its.vertices == original.its.vertices);
+    CHECK(mesh.its.indices == original.its.indices);
+}
+
+TEST_CASE("A mesh enclosing no volume is reported and left untouched", "[MeshRepair]")
+{
+    indexed_triangle_set its;
+    its.vertices = {{0, 0, 0}, {10, 0, 0}, {10, 10, 0}, {0, 10, 0}};
+    its.indices  = {{0, 1, 2}, {0, 2, 3}};
+    TriangleMesh mesh(its);
+    std::string  error;
+    CHECK_FALSE(repair_mesh(mesh, nullptr, &error));
+    CHECK_FALSE(error.empty());
+    CHECK(mesh.its.indices.size() == 2);
+}
+
+TEST_CASE("Progress is reported in order and throwing from it cancels the repair", "[MeshRepair]")
+{
+    TriangleMesh     mesh(soup(cube(20.)));
+    std::vector<int> reported;
+    REQUIRE(repair_mesh(mesh, nullptr, nullptr, [&reported](int percent) { reported.push_back(percent); }));
+    CHECK_FALSE(reported.empty());
+    CHECK(std::is_sorted(reported.begin(), reported.end()));
+
+    struct Canceled {};
+    TriangleMesh       canceled(soup(cube(20.)));
+    const TriangleMesh original = canceled;
+    CHECK_THROWS_AS(repair_mesh(canceled, nullptr, nullptr, [](int) { throw Canceled(); }), Canceled);
+    CHECK(canceled.its.vertices == original.its.vertices);
+    CHECK(canceled.its.indices == original.its.indices);
+}

tests/libslic3r/test_model.cpp

@@ -12,7 +12,9 @@
 #include <catch2/generators/catch_generators.hpp>
 #include <catch2/matchers/catch_matchers.hpp>
 #include <catch2/matchers/catch_matchers_floating_point.hpp>
+#include "libslic3r/MeshRepair.hpp"
 #include "libslic3r/Model.hpp"
+#include "libslic3r/ObjectID.hpp"
 #include "libslic3r/Geometry.hpp"
 #include "libslic3r/libslic3r.h"
 
@@ -97,3 +99,104 @@ TEST_CASE("An instance added from another's scale, rotation and mirror matches i
                                                      original->get_rotation(), original->get_mirror());
     CHECK(copy->get_matrix().linear().isApprox(original->get_matrix().linear(), 1e-9));
 }
+
+namespace {
+
+// A flat triangle first, then a cube for each offset, all in one mesh.
+TriangleMesh flat_triangle_then_cubes(const std::vector<double> &cube_offsets)
+{
+    indexed_triangle_set its;
+    its.vertices = {{-20.f, 0.f, 0.f}, {-10.f, 0.f, 0.f}, {-15.f, 5.f, 0.f}};
+    its.indices  = {{0, 1, 2}};
+    for (double offset : cube_offsets) {
+        TriangleMesh cube = make_cube(10, 10, 10);
+        cube.translate(float(offset), 0.f, 0.f);
+        its_merge(its, cube.its);
+    }
+    return TriangleMesh(its);
+}
+
+} // namespace
+
+TEST_CASE("Splitting a part drops pieces enclosing no volume and keeps the part itself", "[Model]")
+{
+    Model model;
+    ModelObject *object = model.add_object();
+    ModelVolume *volume = object->add_volume(flat_triangle_then_cubes({0., 30.}), ModelVolumeType::MODEL_PART, false);
+    REQUIRE(volume->is_splittable());
+
+    CHECK(volume->split(1, false) == 2);
+    REQUIRE(object->volumes.size() == 2);
+    CHECK(std::find(object->volumes.begin(), object->volumes.end(), volume) != object->volumes.end());
+    for (const ModelVolume *part : object->volumes) {
+        CHECK(part->mesh().facets_count() == 12);
+        CHECK_FALSE(part->is_splittable());
+    }
+}
+
+TEST_CASE("Splitting a part with a single solid piece keeps just that piece", "[Model]")
+{
+    Model model;
+    ModelObject *object = model.add_object();
+    ModelVolume *volume = object->add_volume(flat_triangle_then_cubes({0.}), ModelVolumeType::MODEL_PART, false);
+
+    CHECK(volume->split(1, false) == 1);
+    REQUIRE(object->volumes.size() == 1);
+    CHECK(object->volumes.front() == volume);
+    CHECK(volume->mesh().facets_count() == 12);
+}
+
+TEST_CASE("Splitting a part made only of pieces enclosing no volume leaves it whole", "[Model]")
+{
+    Model model;
+    ModelObject *object = model.add_object();
+    indexed_triangle_set its;
+    its.vertices = {{0.f, 0.f, 0.f}, {10.f, 0.f, 0.f}, {5.f, 5.f, 0.f}, {20.f, 0.f, 0.f}, {30.f, 0.f, 0.f}, {25.f, 5.f, 0.f}};
+    its.indices  = {{0, 1, 2}, {3, 4, 5}};
+    ModelVolume *volume = object->add_volume(TriangleMesh(its), ModelVolumeType::MODEL_PART, false);
+
+    CHECK(volume->split(1, false) == 1);
+    REQUIRE(object->volumes.size() == 1);
+    CHECK(object->volumes.front() == volume);
+    CHECK(volume->mesh().facets_count() == 2);
+}
+
+TEST_CASE("Replacing a part's mesh updates whether it can be split", "[Model]")
+{
+    Model model;
+    ModelObject *object = model.add_object();
+    TriangleMesh two_cubes = make_cube(10, 10, 10);
+    TriangleMesh second    = make_cube(10, 10, 10);
+    second.translate(30.f, 0.f, 0.f);
+    two_cubes.merge(second);
+    ModelVolume *volume = object->add_volume(std::move(two_cubes), ModelVolumeType::MODEL_PART, false);
+    REQUIRE(volume->is_splittable());
+
+    volume->set_mesh(make_cube(10, 10, 10));
+    CHECK_FALSE(volume->is_splittable());
+}
+
+TEST_CASE("Repairing a part replaces its mesh only when the repair changes it", "[Model]")
+{
+    Model model;
+    ModelObject *object = model.add_object();
+    TriangleMesh flipped = make_cube(10, 10, 10);
+    std::swap(flipped.its.indices.front()[1], flipped.its.indices.front()[2]);
+    ModelVolume *broken = object->add_volume(std::move(flipped), ModelVolumeType::MODEL_PART, false);
+    TriangleMesh cube = make_cube(10, 10, 10);
+    cube.translate(30.f, 0.f, 0.f);
+    ModelVolume *valid = object->add_volume(std::move(cube), ModelVolumeType::MODEL_PART, false);
+    const ObjectID broken_id = broken->id();
+    const ObjectID valid_id  = valid->id();
+
+    MeshRepairStats stats;
+    REQUIRE(broken->repair(false, &stats));
+    CHECK(stats.modified);
+    CHECK(broken->id() != broken_id);
+    CHECK_THAT(its_volume(broken->mesh().its), Catch::Matchers::WithinRel(1000., 1e-6));
+    CHECK_FALSE(broken->get_convex_hull().empty());
+
+    REQUIRE(valid->repair(false, &stats));
+    CHECK_FALSE(stats.modified);
+    CHECK(valid->id() == valid_id);
+}

tests/libslic3r/test_preset_bundle_loading.cpp

@@ -37,7 +37,6 @@
 #include <utility>
 #include "libslic3r/Config.hpp"
 #include <map>
-#include <regex>
 #include "libslic3r/libslic3r.h"
 #include "libslic3r/PublishSettings.hpp"
 #include <set>
@@ -7162,126 +7161,3 @@ TEST_CASE("A user filament whose derived compatible printer cannot be written ba
     CHECK(read_file(file) == before);
 }
 #endif
-
-TEST_CASE("User filaments that lost printers their narrowed system parent listed in an older release are found", "[Preset][Bundle]")
-{
-    PresetBundle      bundle;
-    PresetCollection &filaments = bundle.filaments;
-    const std::string parent    = "Generic PETG @Creality K1-all";
-
-    // load_preset inserts in sorted order, so presets are looked up again rather than held by reference.
-    auto set_printers = [&filaments](const std::string &name, std::vector<std::string> printers) {
-        filaments.find_preset(name)->config.option<ConfigOptionStrings>("compatible_printers", true)->values = std::move(printers);
-    };
-    add_inmemory_preset(filaments, parent).is_system = true;
-    add_inmemory_preset(filaments, "My PETG", parent);
-    add_inmemory_preset(filaments, "My PETG own list", parent);
-    set_printers(parent, { "Creality K1C 0.6 nozzle" });
-    set_printers("My PETG", { "Creality K1C 0.6 nozzle" });
-    set_printers("My PETG own list", { "Creality K1C 0.6 nozzle", "Creality K1C 0.8 nozzle" });
-
-    // A printer the parent still lists is not reported again. The system preset and a user preset
-    // with its own list are left alone.
-    std::vector<LegacyPrinterMigration> migrations =
-        filaments.legacy_printer_migrations({ { parent, { "Creality K1C 0.4 nozzle", "Creality K1C 0.6 nozzle" } } });
-    REQUIRE(migrations.size() == 1);
-    CHECK(migrations[0].preset == "My PETG");
-    CHECK(migrations[0].parent == parent);
-    CHECK(migrations[0].printers == std::vector<std::string>{ "Creality K1C 0.4 nozzle" });
-
-    // A parent renamed after the map was written is still found under its old name.
-    add_inmemory_preset(filaments, "Generic PETG @Creality K1 renamed").is_system = true;
-    add_inmemory_preset(filaments, "My renamed PETG", "Generic PETG @Creality K1 renamed");
-    set_renamed_from(filaments, "Generic PETG @Creality K1 renamed", { parent });
-    set_printers("Generic PETG @Creality K1 renamed", { "Creality K1C 0.6 nozzle" });
-    set_printers("My renamed PETG", { "Creality K1C 0.6 nozzle" });
-    migrations = filaments.legacy_printer_migrations({ { parent, { "Creality K1C 0.4 nozzle" } } });
-    REQUIRE(migrations.size() == 2);
-    CHECK(migrations[1].preset == "My renamed PETG");
-    CHECK(migrations[1].parent == "Generic PETG @Creality K1 renamed");
-}
-
-TEST_CASE("Migrating a user filament backs up the user folder to a zip and writes the legacy printers to its file", "[Preset][Bundle]")
-{
-    ScopedTemporaryDir temp_dir;
-    ScopedDataDir      data(temp_dir.path());
-    const std::string  parent    = "Generic PETG @Creality K1-all";
-    auto with_parent = [&parent](PresetBundle &bundle) {
-        add_inmemory_preset(bundle.filaments, parent).is_system = true;
-        bundle.filaments.find_preset(parent)->config.option<ConfigOptionStrings>("compatible_printers", true)->values = { "Creality K1C 0.6 nozzle" };
-    };
-    // Like a real user preset, the file states only its diff, so the printer list comes from the parent.
-    const fs::path user_dir = temp_dir.path() / PRESET_USER_DIR / "default";
-    const fs::path file     = user_dir / PRESET_FILAMENT_NAME / "My PETG.json";
-    fs::create_directories(file.parent_path());
-    const std::string original = std::string(R"({"type":"filament","name":"My PETG","from":"User","version":"1.0.0","inherits":")") + parent + R"("})";
-    std::ofstream(file.string()) << original;
-    auto load = [&user_dir](PresetCollection &filaments) {
-        PresetsConfigSubstitutions substitutions;
-        filaments.load_presets(user_dir.string(), PRESET_FILAMENT_NAME, substitutions, ForwardCompatibilitySubstitutionRule::EnableSilent);
-    };
-    PresetBundle      bundle;
-    PresetCollection &filaments = bundle.filaments;
-    with_parent(bundle);
-    load(filaments);
-    const std::map<std::string, std::vector<std::string>> map{ { parent, { "Creality K1C 0.4 nozzle" } } };
-    const std::vector<LegacyPrinterMigration> migrations = filaments.legacy_printer_migrations(map);
-    REQUIRE(migrations.size() == 1);
-
-    std::vector<std::string> failed;
-    const std::string backup = bundle.migrate_legacy_printers(migrations, failed);
-    REQUIRE_FALSE(backup.empty());
-    CHECK(std::regex_match(fs::path(backup).filename().string(), std::regex("filament_preset_migration_\\d{8}T\\d{6}Z_backup\\.zip")));
-    CHECK(failed.empty());
-    const fs::path extracted = temp_dir.path() / "extracted";
-    REQUIRE(extract_archive_confined(backup, extracted.string()));
-    CHECK(read_file(extracted / PRESET_USER_DIR / "default" / PRESET_FILAMENT_NAME / "My PETG.json") == original);
-
-    // Reloaded from disk, the preset carries both printers itself and needs no further migration.
-    PresetBundle reloaded;
-    with_parent(reloaded);
-    load(reloaded.filaments);
-    const std::vector<std::string> expected{ "Creality K1C 0.6 nozzle", "Creality K1C 0.4 nozzle" };
-    CHECK(reloaded.filaments.find_preset("My PETG")->config.option<ConfigOptionStrings>("compatible_printers")->values == expected);
-    CHECK(reloaded.filaments.legacy_printer_migrations(map).empty());
-    CHECK_FALSE(reloaded.filaments.apply_legacy_printer_migration(migrations[0]));
-}
-
-namespace {
-
-// A filament collection that exposes the rename map update, which PresetBundle runs after loading system presets.
-struct RenameTestFilaments : public PresetCollection
-{
-    RenameTestFilaments()
-        : PresetCollection(Preset::TYPE_FILAMENT, Preset::filament_options(),
-                           static_cast<const PrintRegionConfig &>(FullPrintConfig::defaults()))
-    {}
-    using PresetCollection::update_map_system_profile_renamed;
-};
-
-} // namespace
-
-TEST_CASE("Migrating a user filament keeps the old name of its renamed parent", "[Preset][Bundle]")
-{
-    ScopedTemporaryDir  temp_dir;
-    RenameTestFilaments filaments;
-    const std::string   parent     = "Generic PETG @Creality K1-all";
-    const std::string   old_parent = "Creality Generic PETG @K1-all";
-    add_inmemory_preset(filaments, parent).is_system = true;
-    filaments.find_preset(parent)->config.option<ConfigOptionStrings>("compatible_printers", true)->values = { "Creality K1C 0.6 nozzle" };
-    set_renamed_from(filaments, parent, { old_parent });
-    filaments.update_map_system_profile_renamed();
-    const fs::path file = temp_dir.path() / PRESET_FILAMENT_NAME / "My PETG.json";
-    fs::create_directories(file.parent_path());
-    std::ofstream(file.string()) << R"({"type":"filament","name":"My PETG","from":"User","version":"1.0.0","inherits":")" << old_parent << R"("})";
-    PresetsConfigSubstitutions substitutions;
-    filaments.load_presets(temp_dir.path().string(), PRESET_FILAMENT_NAME, substitutions, ForwardCompatibilitySubstitutionRule::EnableSilent);
-
-    const std::vector<LegacyPrinterMigration> migrations = filaments.legacy_printer_migrations({ { parent, { "Creality K1C 0.4 nozzle" } } });
-    REQUIRE(migrations.size() == 1);
-    REQUIRE(filaments.apply_legacy_printer_migration(migrations[0]));
-    // An older release knows the parent only by its old name.
-    const std::string saved = read_file(file);
-    CHECK(saved.find("\"inherits\": \"" + old_parent + "\"") != std::string::npos);
-    CHECK(saved.find("Creality K1C 0.4 nozzle") != std::string::npos);
-}

tests/libslic3r/test_step.cpp

@@ -4,6 +4,7 @@
 #include <string>
 #include <ios>
 
+#include <catch2/catch_message.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators.hpp>
 #include "libslic3r/Model.hpp"
@@ -91,6 +92,26 @@ TEST_CASE("A cone with a slightly tilted seam imports as a closed mesh", "[Step]
     CHECK(its_num_open_edges(model.objects.front()->volumes.front()->mesh().its) == 0);
 }
 
+// The fixture holds two trimmed planes in a geometric set and no shells or solids, as some CAD exporters write
+// surface models, so OCCT reads it as a compound of loose faces.
+TEST_CASE("A surface model imports whether or not compounds are split", "[Step]")
+{
+    const std::string path  = std::string(TEST_DATA_DIR) + PATH_SEPARATOR "surface_model_geometric_set.step";
+    const bool        split = GENERATE(false, true);
+    CAPTURE(split);
+
+    Model model;
+    bool  cancel = false;
+    Step  step(path);
+
+    REQUIRE(step.load() == Step::Step_Status::LOAD_SUCCESS);
+    REQUIRE(step.mesh(&model, cancel, split) == Step::Step_Status::MESH_SUCCESS);
+
+    REQUIRE(model.objects.size() == 1);
+    REQUIRE(model.objects.front()->volumes.size() == 1);
+    CHECK(model.objects.front()->volumes.front()->mesh().facets_count() > 0);
+}
+
 TEST_CASE("isUtf8 recognises two, three and four byte sequences", "[Step]")
 {
     CHECK(StepPreProcessor::isUtf8("\xC3\xA9"));         // U+00E9

tests/slic3rutils/CMakeLists.txt

@@ -37,6 +37,7 @@ add_executable(${_TEST_NAME}_tests
     test_plugin_json_depth.cpp
     test_shortcuts.cpp
     test_texture_color_palette.cpp
+    test_texture_island_view.cpp
     test_file_url.cpp
     test_user_manager.cpp
     ../fff_print/test_helpers.cpp

tests/slic3rutils/test_action_source.cpp

@@ -255,7 +255,7 @@ TEST_CASE("Native command catalog includes the Help and developer-mode commands"
 
     const Slic3r::GUI::NativeCommand* first = find("help_keyboard_shortcuts");
     REQUIRE(first != nullptr);
-    for (const char* key : {"help_setup_wizard", "help_open_config_folder", "help_migrate_filament_presets", "help_troubleshoot", "help_network_test",
+    for (const char* key : {"help_setup_wizard", "help_open_config_folder", "help_troubleshoot", "help_network_test",
                             "help_benchmark_3d_scene", "help_tip_of_the_day", "help_check_updates", "help_about", "open_wiki",
                             "open_youtube"}) {
         const Slic3r::GUI::NativeCommand* c = find(key);

tests/slic3rutils/test_texture_island_view.cpp

@@ -0,0 +1,99 @@
+// How the texture displacement gizmo's view follows the UV editor's island highlight. The rules live in
+// libslic3r_gui; this is the suite that links it. Same Windows include prologue as
+// test_texture_color_palette.cpp (wx pulls in <windows.h>; keep WIN32_LEAN_AND_MEAN / NOMINMAX ahead of it).
+#ifdef WIN32
+    #ifndef WIN32_LEAN_AND_MEAN
+        #define WIN32_LEAN_AND_MEAN
+    #endif
+    #ifndef NOMINMAX
+        #define NOMINMAX
+    #endif
+    #include <Windows.h>
+#endif
+
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators.hpp>
+
+#include "slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp"
+
+using Follow = Slic3r::GUI::GLGizmoTextureDisplacement::IslandViewFollow;
+
+namespace {
+
+// The View row's indices, and step()'s "apply nothing".
+constexpr int NORMAL = 0, FAST = 1, CHECKER = 2, DISTORTION = 3, NONE = -1;
+
+} // namespace
+
+TEST_CASE("a Normal view gives way to Fast while islands are selected and comes back once none are", "[TextureIslandView][TextureDisplacement]")
+{
+    Follow f;
+    CHECK(f.step(false, NORMAL, false) == NONE);
+    CHECK(f.step(true, NORMAL, false) == FAST);
+    CHECK(f.step(true, FAST, false) == NONE);
+    CHECK(f.step(false, FAST, false) == NORMAL);
+    CHECK(f.step(false, NORMAL, false) == NONE);
+}
+
+TEST_CASE("a Fast, Checker or Distortion view is left alone by the island highlight", "[TextureIslandView][TextureDisplacement]")
+{
+    const int view = GENERATE(FAST, CHECKER, DISTORTION);
+    Follow    f;
+    CHECK(f.step(true, view, false) == NONE);
+    CHECK(f.step(false, view, false) == NONE);
+}
+
+TEST_CASE("arriving in Normal with islands already selected switches to Fast", "[TextureIslandView][TextureDisplacement]")
+{
+    // The pane's Height button over Checker lands in Normal with the islands still selected.
+    Follow f;
+    CHECK(f.step(true, CHECKER, false) == NONE);
+    CHECK(f.step(true, NORMAL, false) == FAST);
+    CHECK(f.step(false, FAST, false) == NORMAL);
+}
+
+TEST_CASE("Normal picked while islands are selected stays until they are deselected", "[TextureIslandView][TextureDisplacement]")
+{
+    Follow f;
+    REQUIRE(f.step(true, NORMAL, false) == FAST);
+    f.picked(NORMAL);
+    CHECK(f.step(true, NORMAL, false) == NONE);
+    // A debug stage opening and closing over it changes nothing.
+    CHECK(f.step(true, NORMAL, true) == NONE);
+    CHECK(f.step(true, NORMAL, false) == NONE);
+    CHECK(f.step(false, NORMAL, false) == NONE);
+    CHECK(f.step(true, NORMAL, false) == FAST);
+}
+
+TEST_CASE("Fast picked while it was switched on stays after deselecting", "[TextureIslandView][TextureDisplacement]")
+{
+    Follow f;
+    REQUIRE(f.step(true, NORMAL, false) == FAST);
+    f.picked(FAST);
+    CHECK(f.step(false, FAST, false) == NONE);
+}
+
+TEST_CASE("Normal picked with nothing selected does not hold off the next switch", "[TextureIslandView][TextureDisplacement]")
+{
+    Follow f;
+    CHECK(f.step(false, NORMAL, false) == NONE);
+    f.picked(NORMAL);
+    CHECK(f.step(true, NORMAL, false) == FAST);
+}
+
+TEST_CASE("a debug stage holds Normal while it is open, and the switch follows once it closes", "[TextureIslandView][TextureDisplacement]")
+{
+    Follow f;
+    REQUIRE(f.step(true, NORMAL, false) == FAST);
+    // The stage takes Normal itself, with the islands still selected.
+    CHECK(f.step(true, NORMAL, true) == NONE);
+    CHECK(f.step(true, NORMAL, false) == FAST);
+}
+
+TEST_CASE("islands deselected while a debug stage is open apply no view over it", "[TextureIslandView][TextureDisplacement]")
+{
+    Follow f;
+    REQUIRE(f.step(true, NORMAL, false) == FAST);
+    CHECK(f.step(false, NORMAL, true) == NONE);
+    CHECK(f.step(false, NORMAL, false) == NONE);
+}