[Bf-blender-cvs] [156b1cc] multiview: From review: add_passes() - change COMBINED pass to mimic what we were doing for rl->rect before

[Dalai Felinto]

Commit: 156b1ccba0974701c55db0ed47564332c0a1da8d
Author: Dalai Felinto
Date:   Mon Mar 23 19:24:07 2015 +0100
Branches: multiview
https://developer.blender.org/rB156b1ccba0974701c55db0ed47564332c0a1da8d

>From review: add_passes() - change COMBINED pass to mimic what we were doing for rl->rect before

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

M	source/blender/render/intern/source/rendercore.c

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

diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index 974d7e7..99611a9 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -570,20 +570,14 @@ static void add_passes(RenderLayer *rl, int offset, ShadeInput *shi, ShadeResult
 	RenderPass *rpass;
 	float *fp;
 
-#if 0
-	/* copy combined to rl->rectf to use for preview */
-	fp = rl->rectf + 4 * offset;
-	copy_v4_v4(fp, shr->combined);
-#endif
-
 	for (rpass= rl->passes.first; rpass; rpass= rpass->next) {
 		float *col= NULL, uvcol[3];
 		int a, pixsize= 3;
 		
 		switch (rpass->passtype) {
 			case SCE_PASS_COMBINED:
-				col= shr->combined;
-				pixsize= 4;
+				/* copy combined to use for preview */
+				copy_v4_v4(rpass->rect + 4*offset, shr->combined);
 				break;
 			case SCE_PASS_Z:
 				fp= rpass->rect + offset;