[Bf-blender-cvs] [ddd1af59018] sculpt-dev: Sculpt-dev: fix crash

[Joseph Eagar]

Commit: ddd1af59018e7bd6c2191cdd3825b42eda72c051
Author: Joseph Eagar
Date:   Tue Nov 16 16:23:42 2021 -0800
Branches: sculpt-dev
https://developer.blender.org/rBddd1af59018e7bd6c2191cdd3825b42eda72c051

Sculpt-dev: fix crash

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

M	release/scripts/startup/bl_ui/properties_paint_common.py
M	source/blender/blenkernel/intern/paint.c

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

diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 728795ebf74..a7a36973a44 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -639,6 +639,9 @@ class UnifiedPaintPanel:
 
                     row2.label(text=name)
 
+                    #note we only expose a single icon that toggles between ALWAYS and NEVER
+                    #mode, to lessen user confusion.
+
                     #row3 = row2.row(align=True)
                     #row3.prop_enum(mp0, "inherit_mode", "ALWAYS", icon="BRUSHES_ALL", text="")
                     #row3.prop_enum(mp0, "inherit_mode", "NEVER", icon="FORWARD", text="")
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index 0541f620373..262e8139e34 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -2036,7 +2036,7 @@ void BKE_sculpt_color_layer_create_if_needed(struct Object *object)
   int types[] = {CD_PROP_COLOR, CD_MLOOPCOL};
   bool has_color = false;
 
-  for (int i = 0; i < 3; i++) {
+  for (int i = 0; i < ARRAY_SIZE(types); i++) {
     bool ok = CustomData_has_layer(&orig_me->vdata, types[i]);
     ok = ok || CustomData_has_layer(&orig_me->ldata, types[i]);