mirror of
https://github.com/bherbruck/solidcraft.git
synced 2026-11-07 12:31:56 +00:00
7f2af7f729
Conflicts, both sides kept:
- Cargo.lock, crates/engine/Cargo.toml: smlib's solidcraft-profile/solidcraft-step beside
main's solidcraft-testkit and the image comment.
- crates/doc/src/{eval,eval_more,name_lookup,project}.rs: smlib's "a stored name finds its
face or edge or asks to reselect" logic kept; main's long-name quoting (#8673) applied to
its messages. Main's split-name hole re-lookup (#10699) dropped: names here never report
split.
- crates/doc/src/lib.rs: both exports, with main's revolve_extent_for_handle.
- crates/engine/src/cmd/silhouette.rs: main's outline()/Silhouette split, on the fallible
world_state().
- crates/engine/src/cmd/sketch_project_tests.rs: both tests.
- crates/ui-egui/src/{canvas,hole_refs}.rs: main's anchor_item/model_text on
open_meshing::session_world.
- crates/ui-egui/src/preview.rs: main's cut_tint switch around smlib's kept-surface ghost
filter; both helpers and both tests.
Seam fixes: FeatureKind::Repair in main's kind_key/type_name_to_kind_key (#10748); main's
new world_state() callers in ui-egui use session_world or unwrap in tests; a sketch test's
Spline gets nurbs: None.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SdcgEu4Lr3moCCisdZShKz