[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13475] trunk/blender/source/blender/ render/intern/source/pipeline.c:

[Brecht Van Lommel]

Revision: 13475
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13475
Author:   blendix
Date:     2008-01-30 14:44:25 +0100 (Wed, 30 Jan 2008)

Log Message:
-----------

Fix for bug #8191: FSA + SSS didn't work.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/pipeline.c

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2008-01-30 13:35:28 UTC (rev 13474)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2008-01-30 13:44:25 UTC (rev 13475)
@@ -1247,7 +1247,7 @@
 	/* need to return nicely all parts on esc */
 	if(R.test_break()==0) {
 		
-		if(R.r.scemode & R_FULL_SAMPLE)
+		if(!R.sss_points && (R.r.scemode & R_FULL_SAMPLE))
 			pa->result= new_full_sample_buffers(&R, &pa->fullresult, &pa->disprect, pa->crop);
 		else
 			pa->result= new_render_result(&R, &pa->disprect, pa->crop, RR_USEMEM);
@@ -1464,7 +1464,7 @@
 	/* first step; free the entire render result, make new, and/or prepare exr buffer saving */
 	RE_FreeRenderResult(re->result);
 	
-	if(re->r.scemode & R_FULL_SAMPLE)
+	if(!re->sss_points && (re->r.scemode & R_FULL_SAMPLE))
 		re->result= new_full_sample_buffers_exr(re);
 	else
 		re->result= new_render_result(re, &re->disprect, 0, re->r.scemode & R_EXR_TILE_FILE);