Previous fix was in wrong part of code... not alpha adding was wrong, but

there was an error in the zbuffer code!

This should fix combinations of using Ztransp and Solid faces.

2 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index 6304abe67ff..87c1330d5ef 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -2569,7 +2569,7 @@ static void shadeDA_tile(RenderPart *pa, float *rectf, float *recta)
 							ys= (float)y + R.jit[samp][1];
 							shadepixel_sky(pa, xs, ys, zbuf, face, (1<<samp), fcol);
 							
-							if(acol && acol[3]!=0.0) addAlphaUnderFloat(fcol, acol);
+							if(acol && acol[3]!=0.0) addAlphaOverFloat(fcol, acol);
 							if(R.do_gamma) {
 								fcol[0]= gammaCorrect(fcol[0]);
 								fcol[1]= gammaCorrect(fcol[1]);
@@ -2585,7 +2585,7 @@ static void shadeDA_tile(RenderPart *pa, float *rectf, float *recta)
 					ys= (float)y+R.samples->centLut[b>>4];
 					shadepixel_sky(pa, xs, ys, zbuf, face, curmask, fcol);
 					
-					if(acol && acol[3]!=0.0) addAlphaUnderFloat(fcol, acol);
+					if(acol && acol[3]!=0.0) addAlphaOverFloat(fcol, acol);
 					
 					if(R.do_gamma) {
 						fcol[0]= gammaCorrect(fcol[0]);
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c
index 1c2cdb2c616..529fb5bd535 100644
--- a/source/blender/render/intern/source/zbuf.c
+++ b/source/blender/render/intern/source/zbuf.c
@@ -1871,7 +1871,7 @@ static void copyto_abufz(RenderPart *pa, int *arectz, int sample)
 		memcpy(arectz, pa->rectz, 4*pa->rectx*pa->recty);
 		return;
 	}
-	if( (R.r.mode & R_OSA)==0 || sample==0) return;
+	//if( (R.r.mode & R_OSA)==0 || sample==0) return;
 		
 	rza= arectz;
 	rd= pa->rectdaps;