The branch rebased onto main keeps each of its commits; where both sides
changed the same code, these are the pieces neither side's commit had.
- Cargo: one [features] table in the CLI's manifest (two met in the merge).
- geom: a NURBS surface's `closed` set once in a placed copy (both sides
added it).
- kernel: the whole-face extrude tools (#2040) work around truck's boolean
on truck types, which left the workspace with the SMLib kernel; the
module, its tests and the doc crate's tool and tests go. The display
planner's flat fill (tess/fallback.rs) has no caller with the schema 4
mesher, and the tessellator's seam and uv modules are the branch's. A
body's boundary tolerance from a STEP file belongs to the truck body the
schema 4 record replaced: `with_boundary_tol` goes. `unmeshed_faces`
counts the coarse mesh as the branch does. A loft's section re-split
passes the lead's perimeter shares to main's `resample` (a circle breaks
there when the matched corners do not go round in order). Main's tests of
the mesh-based measure (the SMLib kernel measures exactly) and of the
IGES preprocessor name (no such field on the branch's import record) go.
- doc: a feature result carries no boolean diagnostics on the branch, so
the model cache neither writes nor reads them, and a pattern copy's miss
test runs the intersect as it is. A placed body's worker result is a
Result: a body taken from the previous placement is Ok. A thread's
clipboard remap takes main's arguments, the tapped catalogue names a
metric size by ThreadForm::Metric, and main's tests unwrap the placing
calls that return their error.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
jyvikoandClaude Opus 5.5
9138e87040