From 1b34c466bc3d8dff972ad0cd55ecb329f3554795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Wed, 15 Mar 2023 17:11:57 +0100 Subject: [PATCH] Fix #105711: Regression: Clone Tool in Image Editor not showing Stencil This was likely caused by a bad merge when doing the uniform name patching for Metal. This also fix the same issue for active UDIM tile overlay which wasn't reported. --- source/blender/draw/engines/overlay/overlay_edit_uv.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/draw/engines/overlay/overlay_edit_uv.cc b/source/blender/draw/engines/overlay/overlay_edit_uv.cc index 9e95b2eca05..3d2353544d7 100644 --- a/source/blender/draw/engines/overlay/overlay_edit_uv.cc +++ b/source/blender/draw/engines/overlay/overlay_edit_uv.cc @@ -324,7 +324,7 @@ void OVERLAY_edit_uv_cache_init(OVERLAY_Data *vedata) obmat[3][0] = float((active_tile->tile_number - 1001) % 10); obmat[3][1] = float((active_tile->tile_number - 1001) / 10); grp = DRW_shgroup_create(sh, psl->edit_uv_tiled_image_borders_ps); - DRW_shgroup_uniform_vec4_copy(grp, "color", selected_color); + DRW_shgroup_uniform_vec4_copy(grp, "ucolor", selected_color); DRW_shgroup_call_obmat(grp, geom, obmat); } } @@ -370,7 +370,7 @@ void OVERLAY_edit_uv_cache_init(OVERLAY_Data *vedata) DRW_shgroup_uniform_bool_copy(grp, "imgPremultiplied", true); DRW_shgroup_uniform_bool_copy(grp, "imgAlphaBlend", true); const float4 color = {1.0f, 1.0f, 1.0f, brush->clone.alpha}; - DRW_shgroup_uniform_vec4_copy(grp, "color", color); + DRW_shgroup_uniform_vec4_copy(grp, "ucolor", color); float size_image[2]; BKE_image_get_size_fl(image, nullptr, size_image);