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

Richard Antalik noreply at git.blender.org
Mon Apr 27 00:57:30 CEST 2020


Commit: 13abd3784ad0034b58cde9e15ea96d6397887dfc
Author: Richard Antalik
Date:   Mon Apr 27 00:57:17 2020 +0200
Branches: master
https://developer.blender.org/rB13abd3784ad0034b58cde9e15ea96d6397887dfc

Merge branch 'blender-v2.83-release'

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



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

diff --cc source/blender/blenkernel/intern/seqprefetch.c
index 4f57776f2ad,67ed40cd48f..bba829529a3
--- a/source/blender/blenkernel/intern/seqprefetch.c
+++ b/source/blender/blenkernel/intern/seqprefetch.c
@@@ -331,8 -331,10 +331,9 @@@ static void *seq_prefetch_frames(void *
    while (pfjob->cfra + pfjob->num_frames_prefetched <= pfjob->scene->r.efra) {
      pfjob->scene_eval->ed->prefetch_job = NULL;
  
+     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,
                                    ADT_RECALC_ALL,



More information about the Bf-blender-cvs mailing list