mirror of
https://github.com/storytold/lightcraft.git
synced 2026-11-01 14:07:34 -06:00
Conflicts resolved: - crates/engine/src/media.rs: main split it; the render and display-profile hunks are ported into media/render.rs - crates/ui-egui/src/lib.rs, panels/detail.rs: main split them; alt_held is set in app/frame.rs, view_overlay and overlay_supports_window ported (panels/detail/window.rs) - crates/ui-egui/src/tests_alt_preview.rs moved to tests/alt_preview.rs - crates/pipeline/src/finish.rs, local.rs: main's code kept, sharpen_mask_weight and texture_sigma applied to it - docs: both sides kept; summary counts from main (regenerated later)