Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

Merge remote-tracking branch 'origin/main' into HEAD

bflatastic661f95b90166
diff --cc crates/engine/src/tests.rs
index 38ff943e7,25237493c..25d05b903
--- a/crates/engine/src/tests.rs
+++ b/crates/engine/src/tests.rs
@@@ -15,9 -15,9 +15,10 @@@ mod frame_export
mod fuzz_open;
mod history;
mod import_project;
+mod instance3d;
mod key_metadata_order;
mod key_time;
+ mod keyframe_text;
mod keylight;
mod limits;
mod lottie;
diff --cc crates/render/src/cache/dependencies.rs
index a0910b0fd,5deffa4db..072b6cf0d
--- a/crates/render/src/cache/dependencies.rs
+++ b/crates/render/src/cache/dependencies.rs
@@@ -118,15 -68,8 +118,15 @@@ impl Dependencies<'_>
if self.path.len() > crate::MAX_FX_DEPTH || self.path.contains(&id) {
return None;
}
+ // A referenced 3D model or primitive layer renders through the comp's camera and lights
+ // (an effect layer parameter reads it that way — Create 3D Layer Instance): hash what
+ // moves its pixels, so the owner keeps a cache entry that changes when any of it does.
+ if layer.source.is_model() {
+ self.soloed_model(ctx, layer)?;
+ return Some(());
+ }
self.remaining = self.remaining.checked_sub(1)?;
- if (self.other_times || super::reads_other_times(layer)) && super::has_expression(&layer.props) {
+ if (self.other_times || super::reads_other_times(layer, None)) && super::has_expression(&layer.props) {
return None;
}
self.path.push(id);