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>2014-06-01 09:11:13 +0400
committerThomas Dinges <blender@dingto.org>2014-06-01 09:11:43 +0400
commit14be4b506ac8011b2d9d733a1577b0e995571ff5 (patch)
treefe7a707bfb96b857ad5e1c786a8299e7f13a5b96 /intern/cycles/render/integrator.cpp
parent09b0eadaddf456cc35c9d6afc068a1f09b34841b (diff)
Cycles: Small optimization for scenes without Transparent Shaders, helps a few percent.
Differential Revision: https://developer.blender.org/D570
Diffstat (limited to 'intern/cycles/render/integrator.cpp')
-rw-r--r--intern/cycles/render/integrator.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/intern/cycles/render/integrator.cpp b/intern/cycles/render/integrator.cpp
index 59a0de07e5a..051ba1baf3a 100644
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@ -95,7 +95,11 @@ void Integrator::device_update(Device *device, DeviceScene *dscene, Scene *scene
kintegrator->transparent_max_bounce = transparent_max_bounce + 1;
kintegrator->transparent_min_bounce = transparent_min_bounce + 1;
- kintegrator->transparent_shadows = transparent_shadows;
+ /* At this point kintegrator->transparent_shadows is set automatically
+ * based on whether shaders use transparent shadows (see shader.cpp).
+ * If user doesn't want transparent shadows, force them off. */
+ if(!transparent_shadows)
+ kintegrator->transparent_shadows = false;
kintegrator->volume_homogeneous_sampling = volume_homogeneous_sampling;
kintegrator->volume_max_steps = volume_max_steps;