Bugfix #3552

Another ancient bug in unified render... the lamphalo wasn't filled in
correctly over sky, especially when the background had halos (or stars).

Only shows when using filters other than box though.

1 files changed, 8 insertions, 4 deletions

diff --git a/source/blender/render/intern/source/vanillaRenderPipe.c b/source/blender/render/intern/source/vanillaRenderPipe.c
index b5b70aa0e0d..968f3e35e73 100644
--- a/source/blender/render/intern/source/vanillaRenderPipe.c
+++ b/source/blender/render/intern/source/vanillaRenderPipe.c
@@ -1065,9 +1065,6 @@ static void renderZBufLine(int y, RE_COLBUFTYPE *colbuf1, RE_COLBUFTYPE *colbuf2
 				j[2]= collector[2]; j[3]= collector[3];
 			}
 			
-			sampleFloatColV2FloatColVFilter(sampcol, colbuf1, colbuf2, colbuf3, osaNr);
-			
-			
 			/* Spothalos are part of the normal pixelshader, so for covered  */
 			/* pixels they are handled ok. They are 'normally' alpha blended */
 			/* onto the existing colour in the collector.                    */
@@ -1078,8 +1075,15 @@ static void renderZBufLine(int y, RE_COLBUFTYPE *colbuf1, RE_COLBUFTYPE *colbuf2
 					collector[1]= gammaCorrect(collector[1]);
 					collector[2]= gammaCorrect(collector[2]);
 				}
-				addAlphaOverFloat(colbuf2+4, collector);
+				
+				j = sampcol;
+				for(i = 0; i < osaNr; i++, j+=4) { 
+					addAlphaOverFloat(j, collector);
+				}
 			}
+			
+			sampleFloatColV2FloatColVFilter(sampcol, colbuf1, colbuf2, colbuf3, osaNr);
+			
 		}
     } 
 }