diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-01-29 20:40:06 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-01-29 20:40:06 +0300 |
| commit | a4f05a17c31892f5a5afcae747c6338a6033948d (patch) | |
| tree | 95fd053d9a99ab2adc5c58f064d13bfaecb49d3e /source/blender/render | |
| parent | ef981e13213f882ecccd39dd043f38052eabc5a0 (diff) | |
Accidentally mixed up addAlphaUnder and addAlphaOver in merging solid and
ztransp layers, for OSA renders. :)
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/rendercore.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c index 87c1330d5ef..6304abe67ff 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) 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]); |