diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2019-08-15 21:23:13 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2019-10-15 11:06:14 +0300 |
commit | b77da65e8c4d8deb5a27e29f5ba518f02fc1c35d (patch) | |
tree | 4e68d945e9c53f4dcafc35ca5be697f86bbd7451 /source/blender/blenkernel/intern/sequencer.c | |
parent | fa76f08db5c56e05bd4f1ad4d0f2337f8f3a95fd (diff) |
Fix T68700: Incorrect 'absolute' timing of animated masks in the Video
Sequence Editor
Code in 'seq_render_mask' will effectively do
BKE_mask_evaluate(mask_temp, mask->sfra + (cfra - fra_offset), true)
where 'fra_offset' is zero for absolute and seq->start for relative.
If we really want the scene's current frame (as advertised) if Mask Time
is set to Absolute (effectively ignoring the Mask Settings start/end) we
need to change the fra_offset from zero to mask->sfra.
Also BKE_animsys_evaluate_animdata should take mask->sfra into account
as well (otherwise mask animation [points] and other animation [e.g.
opacity] will run out of sync)
Reviewers: campbellbarton, ISS
Maniphest Tasks: T68700
Differential Revision: https://developer.blender.org/D5495
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 3e88db787ee..6f7a48ce16b 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -3340,7 +3340,7 @@ static ImBuf *seq_render_mask(const SeqRenderData *context, Mask *mask, float nr /* anim-data */ adt = BKE_animdata_from_id(&mask->id); - BKE_animsys_evaluate_animdata(context->scene, &mask_temp->id, adt, nr, ADT_RECALC_ANIM, false); + BKE_animsys_evaluate_animdata(context->scene, &mask_temp->id, adt, mask->sfra + nr, ADT_RECALC_ANIM, false); maskbuf = MEM_mallocN(sizeof(float) * context->rectx * context->recty, __func__); |