diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-07 15:08:28 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-07 15:09:30 +0300 |
commit | e39ec27bbaebcb85b2541e9756b408c554f602cb (patch) | |
tree | 97beaf63947d0007b861d3bb9285d2d711fab463 /source/blender | |
parent | e3b0d5e99ba70a5b89fa3351b1e53d683967c944 (diff) |
Fix crash when rendering opengl from sequencer.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/render/render_opengl.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index fbe6316905f..5c69748e423 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -238,8 +238,13 @@ static void screen_opengl_views_setup(OGLRender *oglrender) BLI_unlock_thread(LOCK_DRAW_IMAGE); /* will only work for non multiview correctly */ - camera = BKE_camera_multiview_render(oglrender->scene, v3d->camera, "new opengl render view"); - BKE_render_result_stamp_info(oglrender->scene, camera, rr); + if (v3d) { + camera = BKE_camera_multiview_render(oglrender->scene, v3d->camera, "new opengl render view"); + BKE_render_result_stamp_info(oglrender->scene, camera, rr); + } + else { + BKE_render_result_stamp_info(oglrender->scene, oglrender->scene->camera, rr); + } RE_ReleaseResult(oglrender->re); } |