blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Richard Antalik 2020-04-27 00:57:17 +02:00
parent 8a94903c09 d0d16eb7d3
commit 13abd3784a
Notes: blender-bot 2023-02-13 21:56:33 +01:00 
Referenced by issue #78424, Individual Origins + Normal = Broken Again (works in 2.90, broken in 2.83 LTS)
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/seqprefetch.c
View File

@ -331,13 +331,13 @@ static void *seq_prefetch_frames(void *job)
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->id,
adt,
pfjob->cfra + pfjob->num_frames_prefetched,
ADT_RECALC_ALL,
false);
seq_prefetch_update_depsgraph(pfjob);
/* This is quite hacky solution:
* We need cross-reference original scene with copy for cache.