EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Format the merge
vangel760de5887fe733
diff --git a/crates/project/src/lib.rs b/crates/project/src/lib.rsindex 3823f2cb2..aca6e5c96 100644--- a/crates/project/src/lib.rs+++ b/crates/project/src/lib.rs@@ -876,7 +876,9 @@ impl Comp {/// (even during playback) leaves every rendered frame valid. Protected time markers with a/// duration set the timing (Responsive Design), so those always count.pub fn same_pixels_with(&self, o: &Comp, with_markers: bool) -> bool {- self.same_settings(o, with_markers) && self.layers.len() == o.layers.len() && self.layers.iter().zip(&o.layers).all(|(a, b)| a.same_pixels_with(b, with_markers))+ self.same_settings(o, with_markers)+ && self.layers.len() == o.layers.len()+ && self.layers.iter().zip(&o.layers).all(|(a, b)| a.same_pixels_with(b, with_markers))}/// [`Self::same_pixels_with`] but for the layers.