[Bf-blender-cvs] [923547add3e] temp-sculpt-colors: temp-sculpt-colors: fix out of bounds error

[Joseph Eagar]

Commit: 923547add3e9a4bfba3556e7597d381bdd4e1dbb
Author: Joseph Eagar
Date:   Wed Nov 3 16:19:06 2021 -0700
Branches: temp-sculpt-colors
https://developer.blender.org/rB923547add3e9a4bfba3556e7597d381bdd4e1dbb

temp-sculpt-colors: fix out of bounds error

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

M	source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc
M	source/blender/editors/sculpt_paint/sculpt.c

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

diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc
index eb1fac23336..4da63acaa5e 100644
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc
@@ -73,8 +73,6 @@ static void extract_vcol_init(const MeshRenderData *mr,
       AttributeDomain domain = step ? ATTR_DOMAIN_CORNER : ATTR_DOMAIN_POINT;
 
       for (int j = 0; j < count; j++) {
-        int idx = CustomData_get_layer_index_n(cdata, type, j);
-
         char attr_name[32], attr_safe_name[GPU_MAX_SAFE_ATTR_NAME];
         const char *layer_name = CustomData_get_layer_name(cdata, type, j);
         GPU_vertformat_safe_attr_name(layer_name, attr_safe_name, GPU_MAX_SAFE_ATTR_NAME);
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index f9350734bb9..b05a07889e2 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -254,7 +254,7 @@ void SCULPT_vertex_color_set(SculptSession *ss, int index, float color[4])
               MLoopCol *col = ss->mcol + li;
 
               linearrgb_to_srgb_v3_v3(temp, color);
-              temp[4] = color[4];
+              temp[3] = color[3];
 
               rgba_float_to_uchar((char *)col, temp);
             }
@@ -270,7 +270,7 @@ void SCULPT_vertex_color_set(SculptSession *ss, int index, float color[4])
           float temp[4];
 
           linearrgb_to_srgb_v3_v3(temp, color);
-          temp[4] = color[4];
+          temp[3] = color[3];
 
           rgba_float_to_uchar((char *)col, temp);
         }