Accidentally mixed up addAlphaUnder and addAlphaOver in merging solid and
authorTon Roosendaal <ton@blender.org>
Sun, 29 Jan 2006 17:40:06 +0000 (17:40 +0000)
committerTon Roosendaal <ton@blender.org>
Sun, 29 Jan 2006 17:40:06 +0000 (17:40 +0000)
ztransp layers, for OSA renders. :)

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

index 87c1330d5ef3cca62494562ece54744a52b3913c..6304abe67ff80671605c1c62e276812820ab44bc 100644 (file)
@@ -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) addAlphaOverFloat(fcol, acol);
+                                                       if(acol && acol[3]!=0.0) addAlphaUnderFloat(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) addAlphaOverFloat(fcol, acol);
+                                       if(acol && acol[3]!=0.0) addAlphaUnderFloat(fcol, acol);
                                        
                                        if(R.do_gamma) {
                                                fcol[0]= gammaCorrect(fcol[0]);