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-09-17 17:22:42 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-09-17 17:22:42 +0400
commitedde749850b4b660dec570fdb6367d1d51c3cb28 (patch)
tree014c4eb37ad884203f2be2fba6d21a48e7b9de73 /intern/cycles/kernel/kernel_passes.h
parent29b546fe7f9ee4f03f785c7f985a9a15493a0afc (diff)
Fix #36741: cycles AO pass giving values > 1.0 with transparency.
Diffstat (limited to 'intern/cycles/kernel/kernel_passes.h')
-rw-r--r--intern/cycles/kernel/kernel_passes.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_passes.h b/intern/cycles/kernel/kernel_passes.h
index 7b1c6681e0a..5e91b13f90c 100644
--- a/intern/cycles/kernel/kernel_passes.h
+++ b/intern/cycles/kernel/kernel_passes.h
@@ -108,8 +108,8 @@ __device_inline void kernel_write_data_passes(KernelGlobals *kg, __global float
mist = powf(mist, mist_falloff);
/* modulate by transparency */
- float3 alpha = throughput*(make_float3(1.0f, 1.0f, 1.0f) - shader_bsdf_transparency(kg, sd));
- L->mist += (1.0f - mist)*average(alpha);
+ float3 alpha = shader_bsdf_alpha(kg, sd);
+ L->mist += (1.0f - mist)*average(throughput*alpha);
}
#endif
}