EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Merge upstream/main into fix-1083-beat-marker-audio-pause
vangel765289b2e853a7
diff --cc crates/render/src/disk_cache.rsindex 1860d28d6,f867a614a..ae1c3e6f2--- a/crates/render/src/disk_cache.rs+++ b/crates/render/src/disk_cache.rs@@@ -820,9 -834,13 +834,14 @@@ pub fn footage_salt_with(project: &effe/// Content key of a composition's pixels: project render settings, the comp and everything it/// uses (nested comps, footage, solids, their proxies and Use Proxy switches, footage and proxy/// files' size and time). With expressions in play (which can read any comp) the whole project-/// counts. Switches that don't change pixels (Audio, Lock, Shy, Hide Shy Layers) don't count.+/// counts. Switches that don't change pixels (Audio, Lock, Shy, Hide Shy Layers) don't count, and+/// neither do markers unless an expression mentions them.pub fn comp_content_key(project: &effectcraft_project::Project, comp: effectcraft_project::ItemId) -> u128 {+ comp_content_key_with(project, comp, None)+ }++ /// [`comp_content_key`] with [`VirtualFileId`] for paths `std::fs::metadata` cannot describe.+ pub fn comp_content_key_with(project: &effectcraft_project::Project, comp: effectcraft_project::ItemId, virtual_id: Option<VirtualFileId<'_>>) -> u128 {use effectcraft_project::{ItemKind, LayerSource};let mut h = Hash128::default();h.write(RENDER_VERSION.as_bytes());