griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #146886: Zero division in Distance Key node

Browse Source 
Pull Request: https://projects.blender.org/blender/blender/pulls/147550
This commit is contained in:
Omar Emara
2025-10-07 17:22:36 +02:00
committed by Omar Emara
parent a113121562
commit 7d99ac26cc
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/compositor/shaders/library/gpu_shader_compositor_distance_matte.glsl
View File

@@ -3,6 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "gpu_shader_common_color_utils.glsl"
#include "gpu_shader_math_safe_lib.glsl"
#define CMP_NODE_DISTANCE_MATTE_COLOR_SPACE_RGBA 0
#define CMP_NODE_DISTANCE_MATTE_COLOR_SPACE_YCCA 1
@@ -30,7 +31,7 @@ void node_composite_distance_matte(const float4 color,
float difference = distance(color_vector.xyz(), key_vector.xyz());
bool is_opaque = difference > tolerance + falloff;
float alpha = is_opaque ? color.w : max(0.0f, difference - tolerance) / falloff;
float alpha = is_opaque ? color.w : safe_divide(max(0.0f, difference - tolerance), falloff);
matte = min(alpha, color.w);
result = color * matte;
}

3
source/blender/nodes/composite/nodes/node_composite_distance_matte.cc
View File

@@ -105,7 +105,8 @@ static void distance_key(const float4 color,
float difference = math::distance(color_vector.xyz(), key_vector.xyz());
bool is_opaque = difference > tolerance + falloff;
float alpha = is_opaque ? color.w : math::max(0.0f, difference - tolerance) / falloff;
float alpha = is_opaque ? color.w :
math::safe_divide(math::max(0.0f, difference - tolerance), falloff);
matte = math::min(alpha, color.w);
result = color * matte;
}