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
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-08-24 04:27:20 +0400
committerThomas Dinges <blender@dingto.org>2013-08-24 04:27:20 +0400
commit8b20dfe60e496c52131fb4c6037dc7534a627a47 (patch)
treef770d43b716441269b284293f7349c7726e06618 /intern/cycles/kernel/kernel_subsurface.h
parente25ad0778f8f319fc0f4de077b36f5f30d4dc037 (diff)
Cycles:
* Fix Cycles using wrong AA sample values, after integrator renaming.
Diffstat (limited to 'intern/cycles/kernel/kernel_subsurface.h')
-rw-r--r--intern/cycles/kernel/kernel_subsurface.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_subsurface.h b/intern/cycles/kernel/kernel_subsurface.h
index 03e3d086d0c..7127775669b 100644
--- a/intern/cycles/kernel/kernel_subsurface.h
+++ b/intern/cycles/kernel/kernel_subsurface.h
@@ -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