Fix T67516 VSE: Animation evaluated incorrectly when scene strip present

The calls to `BKE_animsys_evaluate_all_animation()` and
`BKE_mask_evaluate_all_masks()` used the wrong timecode to evaluate the
animation system. This happened:

- Sequencer in scene A was rendered at frame X.
- Scene strip for scene B which should be evaluated at frame Y.
- BKE_animsys_evaluate_all_animation() was called with frame Y, which
  also re-evaluated the animation data in scene A.
- Other sequencer strips with animated values were then evaluated for
  frame Y and not frame X.

Since the depsgraph for rendering the scene strip is already OK and does
its job, it's no longer necessary to re-evaluate all the animation in
this way.

Removed `BKE_mask_evaluate_all_masks()` because it's no longer used.

Reviewers: sergey, brecht, iss

Differential Revision: https://developer.blender.org/D5394
This commit is contained in:
Sybren A. Stüvel 2019-08-01 14:10:04 +02:00
parent 71641ab56d
commit 42798a5ca1
Notes: blender-bot 2023-02-14 08:45:09 +01:00
Referenced by issue #67516, Video Sequencer: Strip/Effect Strip animation not applied if keys are set
3 changed files with 0 additions and 21 deletions

View File

@ -171,7 +171,6 @@ void BKE_mask_coord_to_image(struct Image *image,
/* parenting */
void BKE_mask_evaluate_all_masks(struct Main *bmain, float ctime, const bool do_newframe);
void BKE_mask_evaluate(struct Mask *mask, const float ctime, const bool do_newframe);
void BKE_mask_layer_evaluate(struct MaskLayer *masklay, const float ctime, const bool do_newframe);
void BKE_mask_parent_init(struct MaskParent *parent);

View File

@ -1469,15 +1469,6 @@ void BKE_mask_evaluate(Mask *mask, const float ctime, const bool do_newframe)
}
}
void BKE_mask_evaluate_all_masks(Main *bmain, float ctime, const bool do_newframe)
{
Mask *mask;
for (mask = bmain->masks.first; mask; mask = mask->id.next) {
BKE_mask_evaluate(mask, ctime, do_newframe);
}
}
void BKE_mask_parent_init(MaskParent *parent)
{
parent->id_type = ID_MC;

View File

@ -1680,7 +1680,6 @@ static void do_render_all_options(Render *re)
{
Object *camera;
bool render_seq = false;
int cfra = re->r.cfra;
re->current_scene_update(re->suh, re->scene);
@ -1692,16 +1691,6 @@ static void do_render_all_options(Render *re)
BKE_image_all_free_anim_ibufs(re->main, re->r.cfra);
BKE_sequencer_all_free_anim_ibufs(re->scene, re->r.cfra);
/* Update for sequencer and compositing animation.
* TODO: ideally we would create a depsgraph with a copy of the scene
* like the render engine, but sequencer and compositing do not (yet?)
* work with copy-on-write. */
BKE_animsys_evaluate_all_animation(re->main, NULL, re->scene, (float)cfra);
/* Update for masks
* (these do not use animsys but own lighter weight structure to define animation). */
BKE_mask_evaluate_all_masks(re->main, (float)cfra, true);
if (RE_engine_render(re, 1)) {
/* in this case external render overrides all */
}