[Bf-blender-cvs] [d0a70adf8f2] master: Cleanup: shadowed variable warning
Campbell Barton
noreply at git.blender.org
Wed Apr 13 03:59:42 CEST 2022
Commit: d0a70adf8f2e8977fb27f8987488bded33e82106
Author: Campbell Barton
Date: Wed Apr 13 11:55:46 2022 +1000
Branches: master
https://developer.blender.org/rBd0a70adf8f2e8977fb27f8987488bded33e82106
Cleanup: shadowed variable warning
===================================================================
M source/blender/editors/sculpt_paint/sculpt_filter_color.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_color.c b/source/blender/editors/sculpt_paint/sculpt_filter_color.c
index 70ae1fbdd3d..5d4a2c54832 100644
--- a/source/blender/editors/sculpt_paint/sculpt_filter_color.c
+++ b/source/blender/editors/sculpt_paint/sculpt_filter_color.c
@@ -200,14 +200,14 @@ static void color_filter_task_cb(void *__restrict userdata,
bool copy_alpha = col[3] == smooth_color[3];
if (fade < 0.0f) {
- float delta[4];
+ float delta_color[4];
/* Unsharp mask. */
- copy_v4_v4(delta, ss->filter_cache->pre_smoothed_color[vd.index]);
- sub_v4_v4(delta, smooth_color);
+ copy_v4_v4(delta_color, ss->filter_cache->pre_smoothed_color[vd.index]);
+ sub_v4_v4(delta_color, smooth_color);
copy_v4_v4(final_color, col);
- madd_v4_v4fl(final_color, delta, fade);
+ madd_v4_v4fl(final_color, delta_color, fade);
}
else {
blend_color_interpolate_float(final_color, col, smooth_color, fade);
More information about the Bf-blender-cvs
mailing list