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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-02-20 16:10:05 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-02-20 16:10:05 +0400
commit4c287f1d4dcdef959368de4dca9b1e5d7244b5f7 (patch)
tree011f63e326ca4b7db7a7c044603e6c823d518983
parentea99b9a392bddec4ea58b816b1fb66f78c77ff6e (diff)
Fix shadow pass issue with non-progressive render shadow pass with emitting
meshes and world MIS.
-rw-r--r--intern/cycles/render/light.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp
index ccc6c5142bd..47e9dd8e7f5 100644
--- a/intern/cycles/render/light.cpp
+++ b/intern/cycles/render/light.cpp
@@ -360,10 +360,10 @@ void LightManager::device_update_distribution(Device *device, DeviceScene *dscen
/* bit of an ugly hack to compensate for emitting triangles influencing
* amount of samples we get for this pass */
- if(scene->integrator->progressive && kintegrator->pdf_triangles != 0.0f)
- kfilm->pass_shadow_scale = 0.5f;
- else
- kfilm->pass_shadow_scale = 1.0f;
+ kfilm->pass_shadow_scale = 1.0f;
+
+ if(kintegrator->pdf_triangles != 0.0f)
+ kfilm->pass_shadow_scale *= 0.5f;
if(num_background_lights < num_lights)
kfilm->pass_shadow_scale *= (float)(num_lights - num_background_lights)/(float)num_lights;