diff options
author | Richard Antalik <richardantalik@gmail.com> | 2020-10-26 02:28:54 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2020-10-26 02:28:54 +0300 |
commit | 8d1978a8e0131ab59e94e7e37e063db305166711 (patch) | |
tree | 3b57099718c47757da36890fb3e3e370d2f62756 | |
parent | 31629c1363cc8d004eacae9bd43623826af649a6 (diff) |
Fix T81250: Crash after undoing with prefetching
Main DB and it's structs can point to different address after undoing.
In this case problem was that bmain was not updated. Same fix was
done for scene as well.
Reviewed By: sergey
Differential Revision: https://developer.blender.org/D9240
-rw-r--r-- | source/blender/sequencer/intern/prefetch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/sequencer/intern/prefetch.c b/source/blender/sequencer/intern/prefetch.c index 013abb716d4..65b2b6c02cf 100644 --- a/source/blender/sequencer/intern/prefetch.c +++ b/source/blender/sequencer/intern/prefetch.c @@ -319,6 +319,7 @@ static void seq_prefetch_update_scene(Scene *scene) return; } + pfjob->scene = scene; seq_prefetch_free_depsgraph(pfjob); seq_prefetch_init_depsgraph(pfjob); } @@ -499,15 +500,14 @@ static PrefetchJob *seq_prefetch_start(const SeqRenderData *context, float cfra) BLI_mutex_init(&pfjob->prefetch_suspend_mutex); BLI_condition_init(&pfjob->prefetch_suspend_cond); - pfjob->bmain = context->bmain; pfjob->bmain_eval = BKE_main_new(); - pfjob->scene = context->scene; seq_prefetch_init_depsgraph(pfjob); } } seq_prefetch_update_scene(context->scene); seq_prefetch_update_context(context); + pfjob->bmain = context->bmain; pfjob->cfra = cfra; pfjob->num_frames_prefetched = 1; |