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/intern
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-07-30 16:56:39 +0400
committerThomas Dinges <blender@dingto.org>2013-07-30 16:56:39 +0400
commit3d57740a388f526c4598ba0d69216ba2268d0e04 (patch)
tree384e27138032c6dd4bae7e51c6d38d7edf250147 /intern
parentf7169cd47d26af86e0be8980d557c274829732ec (diff)
Cycles / Non-Progressive integrator:
* Avoid check for !LABEL_TRANSPARENT in "kernel_path_non_progressive_lighting", transparency is either handled in the outer loop or in the "kernel_path_indirect" function, but not here.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/kernel/kernel_path.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h
index 6e1843df50d..0ef255786fa 100644
--- a/intern/cycles/kernel/kernel_path.h
+++ b/intern/cycles/kernel/kernel_path.h
@@ -925,10 +925,7 @@ __device_noinline void kernel_path_non_progressive_lighting(KernelGlobals *kg, R
path_radiance_bsdf_bounce(L, &tp, &bsdf_eval, bsdf_pdf, state.bounce, label);
/* set labels */
- float min_ray_pdf = FLT_MAX;
-
- if(!(label & LABEL_TRANSPARENT))
- min_ray_pdf = fminf(bsdf_pdf, min_ray_pdf);
+ float min_ray_pdf = fminf(bsdf_pdf, FLT_MAX);
/* modify path state */
PathState ps = state;