[Bf-blender-cvs] [94ef9f09c99] temp-sculpt-colors: temp-sculpt-colors: Requested patch changes

[Joseph Eagar]

Commit: 94ef9f09c994144d3b6ccf6eb5227e9cd6573475
Author: Joseph Eagar
Date:   Mon Feb 14 15:20:20 2022 -0800
Branches: temp-sculpt-colors
https://developer.blender.org/rB94ef9f09c994144d3b6ccf6eb5227e9cd6573475

temp-sculpt-colors: Requested patch changes

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

M	source/blender/blenkernel/BKE_attribute.h
M	source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_vcol.cc
M	source/blender/makesdna/DNA_mesh_types.h

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

diff --git a/source/blender/blenkernel/BKE_attribute.h b/source/blender/blenkernel/BKE_attribute.h
index a1a8506057f..f7e2dc1b816 100644
--- a/source/blender/blenkernel/BKE_attribute.h
+++ b/source/blender/blenkernel/BKE_attribute.h
@@ -52,9 +52,6 @@ typedef enum AttributeDomainMask {
 bool BKE_id_attributes_supported(struct ID *id);
 
 /**  Create a new attribute layer
- *
- *   \param list_mask restricts unique name check to certain customdata types,
- *          if in doubt just pass CD_MASK_PROP_ALL
  */
 struct CustomDataLayer *BKE_id_attribute_new(
     struct ID *id, const char *name, int type, AttributeDomain domain, struct ReportList *reports);
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 34883d65640..d8dfad5b2cc 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
@@ -146,7 +146,7 @@ static void extract_vcol_init(const MeshRenderData *mr,
 
   Mesh query_mesh = *mr->me;
   BKE_id_attribute_copy_domains_temp(
-      reinterpret_cast<ID *>(&query_mesh), cd_vdata, nullptr, cd_ldata, nullptr, nullptr);
+      &query_mesh.id, cd_vdata, nullptr, cd_ldata, nullptr, nullptr);
 
   CustomDataLayer *active_color = BKE_id_attributes_active_color_get(&query_mesh.id);
   CustomDataLayer *render_color = BKE_id_attributes_render_color_get(&query_mesh.id);
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index 85e4f5899ef..f242be855c8 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -139,11 +139,6 @@ typedef struct Mesh_Runtime {
 
 } Mesh_Runtime;
 
-typedef struct AttributeRef {
-  int domain, type;
-  char name[64];
-} AttributeRef;
-
 typedef struct Mesh {
   ID id;
   /** Animation data (must be immediately after id for utilities to use it). */