diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-06-11 16:40:03 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-06-11 16:40:03 +0300 |
commit | bbba447d54b3f81dde82610d27925fa429e35870 (patch) | |
tree | 44005aef1ea65a83ec7d8143fc79cf4b161002b4 /source/blender/editors/render/render_opengl.c | |
parent | 86d229f52c417c36fabd4e3a3151295ea7aa4a54 (diff) |
OpenGL Render: Fix crash when using audio
Was very easy to reproduce by rendering sequencer with sound strip.
Need to use evaluated scene to open movie handle, since that is the only
scene which has proper sound handle with everything else attached to it.
Diffstat (limited to 'source/blender/editors/render/render_opengl.c')
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 845f60e9ad1..110dc7aaaf1 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -51,6 +51,7 @@ #include "BKE_writeavi.h" #include "DEG_depsgraph.h" +#include "DEG_depsgraph_query.h" #include "DRW_engine.h" @@ -798,11 +799,12 @@ static bool screen_opengl_render_anim_initialize(bContext *C, wmOperator *op) oglrender->movie_ctx_arr = MEM_mallocN(sizeof(void *) * oglrender->totvideos, "Movies"); for (i = 0; i < oglrender->totvideos; i++) { + Scene *scene_eval = DEG_get_evaluated_scene(oglrender->depsgraph); const char *suffix = BKE_scene_multiview_view_id_suffix_get(&scene->r, i); oglrender->movie_ctx_arr[i] = oglrender->mh->context_create(); if (!oglrender->mh->start_movie(oglrender->movie_ctx_arr[i], - scene, + scene_eval, &scene->r, oglrender->sizex, oglrender->sizey, |