diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-16 21:49:54 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-16 21:49:54 +0300 |
| commit | 2c11523b39b8a47ce7bd2e7df9287cc7748d0745 (patch) | |
| tree | db282130d2fcd0828a0f7f5440eec3bde41ff653 /source/blender/render/intern/source/zbuf.c | |
| parent | bb410eb7da428f4939b24851d85fecfd9967b468 (diff) | |
Fix for bug #8285 and #8286: halo crashes with environment maps and
render instancing.
Fix for vector blur alpha blending bug due to my recent bugfix, as
reported on bf-committers.
Diffstat (limited to 'source/blender/render/intern/source/zbuf.c')
| -rw-r--r-- | source/blender/render/intern/source/zbuf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/zbuf.c b/source/blender/render/intern/source/zbuf.c index 84f69b03cda..e86fa5a5186 100644 --- a/source/blender/render/intern/source/zbuf.c +++ b/source/blender/render/intern/source/zbuf.c @@ -3184,8 +3184,8 @@ void RE_zbuf_accumulate_vecblur(NodeBlurData *nbd, int xsize, int ysize, float * /* accum */ for(dr= rectdraw, dz2=newrect, x= xsize*ysize-1; x>=0; x--, dr++, dz2+=4) { if(dr->colpoin) { - float bfac= dr->alpha*blendfac; - float mf= 1.0f - bfac*dr->colpoin[3]; + float bfac= dr->alpha*blendfac*dr->colpoin[3]; + float mf= 1.0f - bfac; dz2[0]= mf*dz2[0] + bfac*dr->colpoin[0]; dz2[1]= mf*dz2[1] + bfac*dr->colpoin[1]; |