[Bf-blender-cvs] [274b083] master: Multi-View: return correct number of views when rendering only one of the stereo pairs

Dalai Felinto noreply at git.blender.org
Tue May 12 23:46:24 CEST 2015


Commit: 274b0838c7cd0f73e866b36456f5a88d710a5776
Author: Dalai Felinto
Date:   Tue May 12 18:43:07 2015 -0300
Branches: master
https://developer.blender.org/rB274b0838c7cd0f73e866b36456f5a88d710a5776

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.

===================================================================

M	source/blender/blenkernel/intern/scene.c

===================================================================

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 3d87279..d3337f0 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++;
 		}
 	}




More information about the Bf-blender-cvs mailing list