[Bf-blender-cvs] [e39ec27] master: Fix crash when rendering opengl from sequencer.
Antony Riakiotakis
noreply at git.blender.org
Thu May 7 14:09:40 CEST 2015
Commit: e39ec27bbaebcb85b2541e9756b408c554f602cb
Author: Antony Riakiotakis
Date: Thu May 7 14:08:28 2015 +0200
Branches: master
https://developer.blender.org/rBe39ec27bbaebcb85b2541e9756b408c554f602cb
Fix crash when rendering opengl from sequencer.
===================================================================
M source/blender/editors/render/render_opengl.c
===================================================================
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index fbe6316..5c69748 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);
}
More information about the Bf-blender-cvs
mailing list