mirror of
https://github.com/storytold/effectcraft.git
synced 2026-10-30 13:08:07 -06:00
Conflicts came from upstream splitting crates/project/src/lib.rs and moving the frames tests. Re-applied the branch's change in the new places: - Layer::same_pixels_with now in crates/project/src/layer.rs - Comp::same_pixels_with, same_settings(o, with_markers), pixel_form_with and the timing-marker helpers in crates/project/src/comp.rs (same_pixels_ignoring_markers stays removed) - Project::reads_markers in crates/project/src/item.rs - crates/ui-egui/src/frames.rs uses reads_markers/same_pixels_with; the branch's two marker tests replace the old ones in crates/ui-egui/src/frames/tests.rs Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>