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

Cycles:

Browse Source 
* Fix Cycles using wrong AA sample values, after integrator renaming.
This commit is contained in:
Thomas Dinges 2013-08-24 00:27:20 +00:00
parent e25ad0778f
commit 8b20dfe60e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/blender_sync.cpp
View File

@ -420,7 +420,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use
preview_samples = preview_samples * preview_samples;
}
if(get_int(cscene, "progressive") == 0) {
if(get_enum(cscene, "progressive") == 0) {
if(background) {
params.samples = aa_samples;
}

8
intern/cycles/kernel/kernel_subsurface.h
View File

@ -111,8 +111,8 @@ __device float3 subsurface_scatter_eval(ShaderData *sd, ShaderClosure *sc, float
sc = &sd->closure[i];
if(CLOSURE_IS_BSSRDF(sc->type)) {
/* in case of non-progressive integrate we sample all bssrdf's once,
* for progressive we pick one, so adjust pdf for that */
/* in case of branched path integrate we sample all bssrdf's once,
* for path trace we pick one, so adjust pdf for that */
float sample_weight = (all)? 1.0f: sc->sample_weight * sample_weight_inv;
/* compute pdf */
@ -464,8 +464,8 @@ __device float3 old_subsurface_scatter_multi_eval(KernelGlobals *kg, ShaderData
float inv_pdf_sum;
if(pdf_sum > 0.0f) {
/* in case of non-progressive integrate we sample all bssrdf's once,
* for progressive we pick one, so adjust pdf for that */
/* in case of branched path integrate we sample all bssrdf's once,
* for path trace we pick one, so adjust pdf for that */
if(all)
inv_pdf_sum = 1.0f/pdf_sum;
else