forked from bartvdbraak/blender
Cycles:
* Fix Cycles using wrong AA sample values, after integrator renaming.
This commit is contained in:
parent
e25ad0778f
commit
8b20dfe60e
@ -420,7 +420,7 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use
|
|||||||
preview_samples = preview_samples * preview_samples;
|
preview_samples = preview_samples * preview_samples;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(get_int(cscene, "progressive") == 0) {
|
if(get_enum(cscene, "progressive") == 0) {
|
||||||
if(background) {
|
if(background) {
|
||||||
params.samples = aa_samples;
|
params.samples = aa_samples;
|
||||||
}
|
}
|
||||||
|
@ -111,8 +111,8 @@ __device float3 subsurface_scatter_eval(ShaderData *sd, ShaderClosure *sc, float
|
|||||||
sc = &sd->closure[i];
|
sc = &sd->closure[i];
|
||||||
|
|
||||||
if(CLOSURE_IS_BSSRDF(sc->type)) {
|
if(CLOSURE_IS_BSSRDF(sc->type)) {
|
||||||
/* in case of non-progressive integrate we sample all bssrdf's once,
|
/* in case of branched path integrate we sample all bssrdf's once,
|
||||||
* for progressive we pick one, so adjust pdf for that */
|
* for path trace we pick one, so adjust pdf for that */
|
||||||
float sample_weight = (all)? 1.0f: sc->sample_weight * sample_weight_inv;
|
float sample_weight = (all)? 1.0f: sc->sample_weight * sample_weight_inv;
|
||||||
|
|
||||||
/* compute pdf */
|
/* compute pdf */
|
||||||
@ -464,8 +464,8 @@ __device float3 old_subsurface_scatter_multi_eval(KernelGlobals *kg, ShaderData
|
|||||||
float inv_pdf_sum;
|
float inv_pdf_sum;
|
||||||
|
|
||||||
if(pdf_sum > 0.0f) {
|
if(pdf_sum > 0.0f) {
|
||||||
/* in case of non-progressive integrate we sample all bssrdf's once,
|
/* in case of branched path integrate we sample all bssrdf's once,
|
||||||
* for progressive we pick one, so adjust pdf for that */
|
* for path trace we pick one, so adjust pdf for that */
|
||||||
if(all)
|
if(all)
|
||||||
inv_pdf_sum = 1.0f/pdf_sum;
|
inv_pdf_sum = 1.0f/pdf_sum;
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user