[Bf-blender-cvs] [79a3861] multiview: Fixup for stereo output (side-by-side, top-bottom)

[Dalai Felinto]

Commit: 79a38614133f959b01e10711efbc32ae8668f3af
Author: Dalai Felinto
Date:   Fri Aug 15 17:28:59 2014 +0200
Branches: multiview
https://developer.blender.org/rB79a38614133f959b01e10711efbc32ae8668f3af

Fixup for stereo output (side-by-side, top-bottom)

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

M	source/blender/imbuf/intern/stereoimbuf.c
M	source/blender/render/intern/source/pipeline.c

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

diff --git a/source/blender/imbuf/intern/stereoimbuf.c b/source/blender/imbuf/intern/stereoimbuf.c
index 2f05cc8..f5c93c5 100644
--- a/source/blender/imbuf/intern/stereoimbuf.c
+++ b/source/blender/imbuf/intern/stereoimbuf.c
@@ -426,7 +426,7 @@ static void imb_stereo_interlace(Stereo3DData *s3d, enum eStereoInterlaceType mo
 static void imb_stereo_sidebyside(Stereo3DData *s3d, const bool crosseyed)
 {
 	int y;
-	size_t width = s3d->x / 2;
+	size_t width = s3d->x;
 	size_t height= s3d->y;
 	const size_t channels = s3d->channels;
 
@@ -476,7 +476,7 @@ static void imb_stereo_topbottom(Stereo3DData *s3d)
 {
 	int y;
 	size_t width = s3d->x;
-	size_t height= s3d->y / 2;
+	size_t height= s3d->y;
 	const size_t channels = s3d->channels;
 
 	const int stride_from = width;
@@ -590,7 +590,7 @@ float *IMB_stereo_from_rectf(ImageFormatData *im_format, const size_t x, const s
 	IMB_stereo_dimensions(im_format->stereo_output.display_mode, x, y, &width, &height);
 	r_rectf = MEM_mallocN(channels * sizeof(float) * width * height, __func__);
 
-	imb_stereo_data_initialize(&s3d_data, im_format, width, height, channels, NULL, NULL, NULL, left, right, r_rectf);
+	imb_stereo_data_initialize(&s3d_data, im_format, x, y, channels, NULL, NULL, NULL, left, right, r_rectf);
 	imb_stereo_doit(&s3d_data, &im_format->stereo_output);
 
 	return r_rectf;
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 2f28c0d..f2da803 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -3199,7 +3199,7 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
 				}
 			}
 			else {
-				ImBuf *ibuf[2] = {NULL};
+				ImBuf *ibuf[3] = {NULL};
 				const char *names[2] = {STEREO_LEFT_NAME, STEREO_RIGHT_NAME};
 				int i;