[Bf-blender-cvs] [c5456819ee4] master: Fix T96655: Bloom crashes Eevee

[Hallam Roberts]

Commit: c5456819ee4904b6b1ec59b3f4ef705d29f170ac
Author: Hallam Roberts
Date:   Mon Mar 21 13:18:22 2022 +0100
Branches: master
https://developer.blender.org/rBc5456819ee4904b6b1ec59b3f4ef705d29f170ac

Fix T96655: Bloom crashes Eevee

This patch fixes T96655, bloom crashing Eevee.

The error occurs because rB472fc0c55848b2e2d428cfb4f7debb80a4e12081 added `vec3 safe_color(vec3 c)` to `common_math_lib.glsl`.

However, `vec3 safe_color(vec3 c)` already exists in `effect_bloom_frag.glsl`.
This means `vec3 safe_color(vec3 c)` is duplicated within `common_math_lib.glsl` and `effect_bloom_frag.glsl`.

{F12938060 size=full}

The duplicate code in `effect_bloom_frag.glsl` can be removed since it's no longer needed.

(I checked the remaining methods, there shouldn't be any additional duplicate code)

Reviewed By: fclem

Maniphest Tasks: T96655

Differential Revision: https://developer.blender.org/D14396

===================================================================

M	release/scripts/addons
M	source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl

===================================================================

diff --git a/release/scripts/addons b/release/scripts/addons
index bb62f10715a..67f1fbca148 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit bb62f10715a871d7069d2b2c74b2efc97c3c350c
+Subproject commit 67f1fbca1482d9d9362a4001332e785c3fd5d230
diff --git a/source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl
index c6f61d1d443..9d9d7beb3cb 100644
--- a/source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/effect_bloom_frag.glsl
@@ -50,12 +50,6 @@ out vec4 FragColor;
 
 /* -------------- Utils ------------- */
 
-vec3 safe_color(vec3 c)
-{
-  /* Clamp to avoid black square artifacts if a pixel goes NaN. */
-  return clamp(c, vec3(0.0), vec3(1e20)); /* 1e20 arbitrary. */
-}
-
 /* 3-tap median filter */
 vec3 median(vec3 a, vec3 b, vec3 c)
 {