Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2008-01-30 16:44:25 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2008-01-30 16:44:25 +0300
commite67422e863adbdce678b33e56defdaa6caae8ef0 (patch)
treebc72f64c6ba5684a9ca203fb81e527fa32ddfb0f /source
parent33656dfa83a3c89f8c5729282fb6d4d99d5ae79a (diff)
Fix for bug #8191: FSA + SSS didn't work.
Diffstat (limited to 'source')
-rw-r--r--source/blender/render/intern/source/pipeline.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index d3193a7eaaf..3690a068983 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -1247,7 +1247,7 @@ static void *do_part_thread(void *pa_v)
/* 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 @@ static void threaded_tile_processor(Render *re)
/* 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);