kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Error in combo of Spothalo + normal halo over sky, with OSA + gammacorrected

Browse Source 
adding. :)

Missing gamma correction...
This commit is contained in:
Ton Roosendaal 2005-05-01 17:11:48 +00:00
parent a6bb0b7f79
commit 8c1d95abc7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/render/intern/source/pixelshading.c
View File

@ -145,9 +145,9 @@ void *renderPixel(RE_COLBUFTYPE *collector, float x, float y, int *obdata, int m
/* ------------------------------------------------------------------------- */
void renderSpotHaloPixel(float x, float y, float* target)
void renderSpotHaloPixel(float x, float y, float* fcol)
{
shadepixel(x, y, 0, 0, 0, target);
shadepixel(x, y, 0, 0, 0, fcol);
}

5
source/blender/render/intern/source/vanillaRenderPipe.c
View File

@ -1067,6 +1067,11 @@ static void renderZBufLine(int y, RE_COLBUFTYPE *colbuf1, RE_COLBUFTYPE *colbuf2
/* onto the existing colour in the collector. */
if(R.flag & R_LAMPHALO) {
renderSpotHaloPixel(x, y, collector);
if(do_gamma) {
collector[0]= gammaCorrect(collector[0]);
collector[1]= gammaCorrect(collector[1]);
collector[2]= gammaCorrect(collector[2]);
}
addAlphaOverFloat(colbuf2+4, collector);
}
}