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>2015-05-13 00:43:07 +0300
committerDalai Felinto <dfelinto@gmail.com>2015-05-13 00:46:09 +0300
commit274b0838c7cd0f73e866b36456f5a88d710a5776 (patch)
treefc543707621800da78f9b87821beaa1320aed559 /source/blender/blenkernel/intern/scene.c
parentb3334d936f9e840d79fe224a71110302fc8cbee9 (diff)
Multi-View: return correct number of views when rendering only one of the stereo pairs
Without this fix ViewerNode would continously trash the views/buffer when disabling either stereo eye.
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
-rw-r--r--source/blender/blenkernel/intern/scene.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 3d87279e054..d3337f02f11 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -2213,11 +2213,13 @@ size_t BKE_scene_multiview_num_views_get(const RenderData *rd)
return 1;
if (rd->views_format == SCE_VIEWS_FORMAT_STEREO_3D) {
- if (BLI_findstring(&rd->views, STEREO_LEFT_NAME, offsetof(SceneRenderView, name))) {
+ srv = BLI_findstring(&rd->views, STEREO_LEFT_NAME, offsetof(SceneRenderView, name));
+ if ((srv && srv->viewflag & SCE_VIEW_DISABLE) == 0) {
totviews++;
}
- if (BLI_findstring(&rd->views, STEREO_RIGHT_NAME, offsetof(SceneRenderView, name))) {
+ srv = BLI_findstring(&rd->views, STEREO_RIGHT_NAME, offsetof(SceneRenderView, name));
+ if ((srv && srv->viewflag & SCE_VIEW_DISABLE) == 0) {
totviews++;
}
}