[Bf-blender-cvs] [9e2327287e3] refactor-mesh-remove-pointers: Cleanup: Remove mcol

[Hans Goudey]

Commit: 9e2327287e30eda6082ca8ff1a32e7064b036657
Author: Hans Goudey
Date:   Mon Jul 11 12:48:32 2022 -0500
Branches: refactor-mesh-remove-pointers
https://developer.blender.org/rB9e2327287e30eda6082ca8ff1a32e7064b036657

Cleanup: Remove mcol

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

M	source/blender/blenkernel/intern/mesh.cc
M	source/blender/makesdna/DNA_mesh_types.h

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

diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc
index c5dff438628..3e61da80c78 100644
--- a/source/blender/blenkernel/intern/mesh.cc
+++ b/source/blender/blenkernel/intern/mesh.cc
@@ -284,7 +284,6 @@ static void mesh_blend_read_data(BlendDataReader *reader, ID *id)
   BLO_read_data_address(reader, &mesh->mpoly);
   BLO_read_data_address(reader, &mesh->tface);
   BLO_read_data_address(reader, &mesh->mtface);
-  BLO_read_data_address(reader, &mesh->mcol);
   BLO_read_data_address(reader, &mesh->dvert);
   BLO_read_data_address(reader, &mesh->mloopuv);
   BLO_read_data_address(reader, &mesh->mselect);
@@ -876,7 +875,6 @@ void BKE_mesh_update_customdata_pointers(Mesh *me, const bool do_ensure_tess_cd)
   me->medge = (MEdge *)CustomData_get_layer(&me->edata, CD_MEDGE);
 
   me->mface = (MFace *)CustomData_get_layer(&me->fdata, CD_MFACE);
-  me->mcol = (MCol *)CustomData_get_layer(&me->fdata, CD_MCOL);
   me->mtface = (MTFace *)CustomData_get_layer(&me->fdata, CD_MTFACE);
 
   me->mpoly = (MPoly *)CustomData_get_layer(&me->pdata, CD_MPOLY);
@@ -950,7 +948,6 @@ static void mesh_tessface_clear_intern(Mesh *mesh, int free_customdata)
 
   mesh->mface = nullptr;
   mesh->mtface = nullptr;
-  mesh->mcol = nullptr;
   mesh->totface = 0;
 }
 
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index e00e29742be..d4e4fc75e7b 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -307,10 +307,6 @@ typedef struct Mesh {
   /** Deprecated, use mtface. */
   struct TFace *tface DNA_DEPRECATED;
 
-  /* Deprecated. Array of colors for the tessellated faces, must be number of tessellated
-   * faces * 4 in length. This is stored in #fdata, and deprecated. */
-  struct MCol *mcol;
-
   /**
    * Deprecated face storage (quads & triangles only);
    * faces are now pointed to by #Mesh.mpoly and #Mesh.mloop.