Merge pull request #3211 from vangel76/frame-blend-interpret-3180

Frame blending averages the source frames a comp frame skips over (fast-conformed footage)
This commit is contained in:
FredApps authored and GitHub committed 2026-11-14 17:04:22 +01:00
commit 4579f91c94
6 files changed
+351 -23

No files matched your search

+6 -1
View File
@@ -124,6 +124,8 @@ impl Dependencies<'_> {
Some(())
}
/// Folds what the layer contributes at this time into the dependency cache key, including its source, effects and frame blend state.
/// Returns `None` when the layer cannot be keyed: past the depth limit, in a reference cycle, or with expressions that read other times.
fn layer(&mut self, ctx: &EvalCtx, layer: &Layer) -> Option<()> {
let id = (ctx.comp_id, layer.id);
if self.path.len() > crate::MAX_FX_DEPTH || self.path.contains(&id) {
@@ -167,7 +169,10 @@ impl Dependencies<'_> {
hash_debug(self.h, &source);
if let Some(source) = source {
match &source.kind {
ItemKind::Footage(_) => ctx.source_time(layer).0.hash(self.h),
ItemKind::Footage(_) => {
ctx.source_time(layer).0.hash(self.h);
super::hash_blend_spans(self.h, ctx, layer);
}
ItemKind::Comp(comp) => {
let time = ctx.source_time(layer);
time.0.hash(self.h);