Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2019-08-01 15:10:04 +0300
committerSybren A. Stüvel <sybren@blender.org>2019-08-13 17:38:22 +0300
commit42798a5ca16154c9ecaf5a2359bd0b4fbe9dec94 (patch)
treec6058d021044aba7c7472632dba1e2e83d72b760 /source/blender/blenkernel/intern/mask.c
parent71641ab56d0f0cb52c301b83ff499699029fa032 (diff)
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
Diffstat (limited to 'source/blender/blenkernel/intern/mask.c')
-rw-r--r--source/blender/blenkernel/intern/mask.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c
index bb93d068bef..8f8150b6a64 100644
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@ -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;