[Bf-blender-cvs] [7677b2428ad] sculpt-dev: Sculpt-dev: fix merge errors in attribute code

[Joseph Eagar]

Commit: 7677b2428ad7631d02de19f83dfd6f49f6d3c101
Author: Joseph Eagar
Date:   Wed May 11 23:30:09 2022 -0700
Branches: sculpt-dev
https://developer.blender.org/rB7677b2428ad7631d02de19f83dfd6f49f6d3c101

Sculpt-dev: fix merge errors in attribute code

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

M	release/scripts/startup/bl_ui/properties_data_mesh.py
M	source/blender/blenkernel/intern/attribute.c
M	source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
M	source/blender/draw/intern/mesh_extractors/extract_mesh.h
M	source/blender/makesrna/intern/rna_attribute.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index 516d037b03a..9020fe0816c 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -603,22 +603,21 @@ class MESH_UL_color_attributes(UIList, ColorAttributesListBase):
         split.emboss = 'NONE'
         split.prop(attribute, "name", text="", icon='GROUP_VCOL')
 
+        sub = split.row()
+        sub.alignment = 'RIGHT'
+        sub.active = False
+        sub.label(text="%s ▶ %s" % (domain_name, data_type.name))
+
         active_render = _index == data.color_attributes.render_color_index
 
-        row = split.row()
+        row = layout.row()
         row.emboss = 'NONE'
-        prop = split.operator(
+        prop = row.operator(
             "geometry.color_attribute_render_set",
             text="",
             icon='RESTRICT_RENDER_OFF' if active_render else 'RESTRICT_RENDER_ON',
         )
-
-        props.name = attribute.name
-
-        sub = split.row()
-        sub.alignment = 'RIGHT'
-        sub.active = False
-        sub.label(text="%s ▶ %s" % (domain_name, data_type.name))
+        prop.name = attribute.name
 
 
 class MESH_UL_color_attributes_selector(UIList, ColorAttributesListBase):
diff --git a/source/blender/blenkernel/intern/attribute.c b/source/blender/blenkernel/intern/attribute.c
index 68176703ba6..7f93eb7b393 100644
--- a/source/blender/blenkernel/intern/attribute.c
+++ b/source/blender/blenkernel/intern/attribute.c
@@ -93,7 +93,7 @@ static CustomData *attribute_customdata_find(ID *id, CustomDataLayer *layer)
   for (AttributeDomain domain = 0; domain < ATTR_DOMAIN_NUM; domain++) {
     CustomData *customdata = info[domain].customdata;
     if (customdata &&
-        ARRAY_HAS_ITEM(layer, (CustomDataLayer const *)customdata->layers, customdata->totlayer)) {
+        ARRAY_HAS_ITEM((CustomDataLayer *)layer, customdata->layers, customdata->totlayer)) {
       return customdata;
     }
   }
@@ -285,13 +285,7 @@ int BKE_id_attributes_length(const ID *id, AttributeDomainMask domain_mask, Cust
     CustomData *customdata = info[domain].customdata;
 
     if (customdata && ((1 << (int)domain) & domain_mask)) {
-      for (int i = 0; i < customdata->totlayer; i++) {
-        CustomDataLayer *layer = customdata->layers + i;
-
-        if ((mask & CD_TYPE_AS_MASK(layer->type)) && !(layer->flag & CD_FLAG_TEMPORARY)) {
-          length++;
-        }
-      }
+      length += CustomData_number_of_layers_typemask(customdata, mask);
     }
   }
 
@@ -305,7 +299,8 @@ AttributeDomain BKE_id_attribute_domain(const ID *id, const CustomDataLayer *lay
 
   for (AttributeDomain domain = 0; domain < ATTR_DOMAIN_NUM; domain++) {
     CustomData *customdata = info[domain].customdata;
-    if (customdata && ARRAY_HAS_ITEM(layer, customdata->layers, customdata->totlayer)) {
+    if (customdata &&
+        ARRAY_HAS_ITEM((CustomDataLayer *)layer, customdata->layers, customdata->totlayer)) {
       return domain;
     }
   }
@@ -335,7 +330,8 @@ int BKE_id_attribute_data_length(ID *id, CustomDataLayer *layer)
 
   for (AttributeDomain domain = 0; domain < ATTR_DOMAIN_NUM; domain++) {
     CustomData *customdata = info[domain].customdata;
-    if (customdata && ARRAY_HAS_ITEM(layer, customdata->layers, customdata->totlayer)) {
+    if (customdata &&
+        ARRAY_HAS_ITEM((CustomDataLayer *)layer, customdata->layers, customdata->totlayer)) {
       return info[domain].length;
     }
   }
diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
index cdcc9ae1a97..a76d31fbf17 100644
--- a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
+++ b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.c
@@ -447,11 +447,6 @@ MeshRenderData *mesh_render_data_create(Object *object,
     mr->edit_bmesh = me->edit_mesh;
     mr->me = (do_final) ? editmesh_eval_final : editmesh_eval_cage;
 
-    mr->me->attributes_active_index = me->attributes_active_index;
-
-    mr->me->attr_color_active = me->attr_color_active;
-    mr->me->attr_color_render = me->attr_color_render;
-
     mr->edit_data = is_mode_active ? mr->me->runtime.edit_data : NULL;
 
     if (mr->edit_data) {
diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh.h b/source/blender/draw/intern/mesh_extractors/extract_mesh.h
index b9fe939f10b..d55386dfd7d 100644
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh.h
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh.h
@@ -24,7 +24,6 @@ extern "C" {
 #endif
 
 struct DRWSubdivCache;
-struct AttributeRef;
 
 #define MIN_RANGE_LEN 1024
 
@@ -361,10 +360,6 @@ extern const MeshExtract extract_vert_idx;
 extern const MeshExtract extract_fdot_idx;
 extern const MeshExtract extract_attr[GPU_MAX_ATTR];
 
-int mesh_cd_get_active_color_i(const Mesh *me, const CustomData *cd_vdata, const CustomData *cd_ldata);
-int mesh_cd_get_render_color_i(const Mesh *me, const CustomData *cd_vdata, const CustomData *cd_ldata);
-int mesh_cd_get_vcol_i(const Mesh *me, const CustomData *cd_vdata, const CustomData *cd_ldata, const struct AttributeRef *ref);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/makesrna/intern/rna_attribute.c b/source/blender/makesrna/intern/rna_attribute.c
index 2d9517ce1ee..bba5cb7c06f 100644
--- a/source/blender/makesrna/intern/rna_attribute.c
+++ b/source/blender/makesrna/intern/rna_attribute.c
@@ -456,7 +456,7 @@ int rna_AttributeGroup_color_length(PointerRNA *ptr)
                                   CD_MASK_PROP_COLOR | CD_MASK_PROP_BYTE_COLOR);
 }
 
-int rna_AttributeGroup_length(PointerRNA *ptr)
+ATTR_NO_OPT int rna_AttributeGroup_length(PointerRNA *ptr)
 {
   return BKE_id_attributes_length(ptr->owner_id, ATTR_DOMAIN_MASK_ALL, CD_MASK_PROP_ALL);
 }