[Bf-blender-cvs] [f5c682045dc] master: Merge branch 'blender-v2.83-release'

[Richard Antalik]

Commit: f5c682045dc61d038915dbb301bd7db2a04fb299
Author: Richard Antalik
Date:   Fri May 22 13:36:23 2020 +0200
Branches: master
https://developer.blender.org/rBf5c682045dc61d038915dbb301bd7db2a04fb299

Merge branch 'blender-v2.83-release'

===================================================================



===================================================================

diff --cc source/blender/blenkernel/intern/seqprefetch.c
index f00d517940a,d400f712728..c6ad84f4806
--- a/source/blender/blenkernel/intern/seqprefetch.c
+++ b/source/blender/blenkernel/intern/seqprefetch.c
@@@ -412,9 -435,10 +435,9 @@@ static void *seq_prefetch_frames(void *
  
      seq_prefetch_update_depsgraph(pfjob);
      AnimData *adt = BKE_animdata_from_id(&pfjob->context_cpy.scene->id);
 -    BKE_animsys_evaluate_animdata(pfjob->context_cpy.scene,
 -                                  &pfjob->context_cpy.scene->id,
 +    BKE_animsys_evaluate_animdata(&pfjob->context_cpy.scene->id,
                                    adt,
-                                   pfjob->cfra + pfjob->num_frames_prefetched,
+                                   seq_prefetch_cfra(pfjob),
                                    ADT_RECALC_ALL,
                                    false);