[Bf-blender-cvs] [e426e18] multiview: From review: add_filt_passes() - change COMBINED pass filtering and remove commented out code

[Dalai Felinto]

Commit: e426e18f77d7c65fd471f1bd16b6533070ab4c4b
Author: Dalai Felinto
Date:   Mon Mar 23 19:01:25 2015 +0100
Branches: multiview
https://developer.blender.org/rBe426e18f77d7c65fd471f1bd16b6533070ab4c4b

>From review: add_filt_passes() - change COMBINED pass filtering and remove commented out code

Note: I don't know which difference does it make to the user, but better to stick to what master is doing

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

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 ae13bc4..974d7e7 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -458,19 +458,13 @@ static void add_filt_passes(RenderLayer *rl, int curmask, int rectx, int offset,
 {
 	RenderPass *rpass;
 
-#if 0
-	/* combined rgb */
-	add_filt_fmask(curmask, shr->combined, rl->rectf + 4*offset, rectx);
-#endif
-
 	for (rpass= rl->passes.first; rpass; rpass= rpass->next) {
 		float *fp, *col= NULL;
 		int pixsize= 3;
 		
 		switch (rpass->passtype) {
 			case SCE_PASS_COMBINED:
-				col= shr->combined;
-				pixsize= 4;
+				add_filt_fmask(curmask, shr->combined, rpass->rect + 4*offset, rectx);
 				break;
 			case SCE_PASS_Z:
 				fp= rpass->rect + offset;