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:
authorSergey Sharybin <sergey@blender.org>2021-11-25 12:22:32 +0300
committerSergey Sharybin <sergey@blender.org>2021-11-25 12:22:32 +0300
commit5ffb9b6dc45f58cf2b880230d912496fed0dd9ed (patch)
tree792b650f8466c8df4fbe6a6f30095b0f36414bdc /intern/cycles/kernel
parent610e68590b7f0bc0a4345bfc21bc253ff760e70c (diff)
parenta0acb9bd0cc049b7b8b941b251c42684b4a0f274 (diff)
Merge remote-tracking branch 'origin/blender-v3.0-release'
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r--intern/cycles/kernel/film/read.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/film/read.h b/intern/cycles/kernel/film/read.h
index d308a9818e2..18a593a75b1 100644
--- a/intern/cycles/kernel/film/read.h
+++ b/intern/cycles/kernel/film/read.h
@@ -460,7 +460,7 @@ ccl_device_inline float4 film_calculate_shadow_catcher_matte_with_shadow(
const float transparency = in_matte[3] * scale;
const float alpha = saturatef(1.0f - transparency);
- const float alpha_matte = (1.0f - alpha) * (1.0f - average(shadow_catcher)) + alpha;
+ const float alpha_matte = (1.0f - alpha) * (1.0f - saturatef(average(shadow_catcher))) + alpha;
if (kfilm_convert->use_approximate_shadow_catcher_background) {
kernel_assert(kfilm_convert->pass_background != PASS_UNUSED);