Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2019-03-22 19:15:05 +0300
committerDalai Felinto <dfelinto@gmail.com>2019-03-22 19:20:54 +0300
commit5f45cbb26ec853b09b88c795c9b6107425f91f8a (patch)
tree0e9f8595826d50637b8e1ce99138e32528843df0 /source/blender/editors/render
parent193b708a4866772ba6b0c646d4694de2570dad1b (diff)
Fix T58517: Multi-view issues with OpenGL render + scene settings
Patch by Shinsuke Irie. * * * Note from reviewer/committer (dfelinto): OpenGL render from the VSE preview window is working, while the VSE preview window itself does not show stereo. That said the patch is ok, and I was able to test that the VSE preview OpenGL still works. I will tackle VSE preview itself separately myself.
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r--source/blender/editors/render/render_opengl.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c
index 84b84f1dd52..3fdc34bd9c9 100644
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@ -156,10 +156,10 @@ static bool screen_opengl_is_multiview(OGLRender *oglrender)
RegionView3D *rv3d = oglrender->rv3d;
RenderData *rd = &oglrender->scene->r;
- if ((rd == NULL) || ((!oglrender->is_sequencer) && ((rv3d == NULL) || (v3d == NULL))))
+ if ((rd == NULL) || ((v3d != NULL) && (rv3d == NULL)))
return false;
- return (rd->scemode & R_MULTIVIEW) && ((oglrender->is_sequencer) || (rv3d->persp == RV3D_CAMOB && v3d->camera));
+ return (rd->scemode & R_MULTIVIEW) && ((v3d == NULL) || (rv3d->persp == RV3D_CAMOB && v3d->camera));
}
static void screen_opengl_views_setup(OGLRender *oglrender)
@@ -203,8 +203,9 @@ static void screen_opengl_views_setup(OGLRender *oglrender)
}
}
else {
- if (!oglrender->is_sequencer)
+ if (v3d) {
RE_SetOverrideCamera(oglrender->re, V3D_CAMERA_SCENE(oglrender->scene, v3d));
+ }
/* remove all the views that are not needed */
rv = rr->views.last;