Progress

9 files changed, 23 insertions, 19 deletions

diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index fa301926ac9..2d1611d0631 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -308,7 +308,7 @@ static void mesh_merge_transform(Mesh *result,
 
   /* remap the vertex groups if necessary */
   if (CustomData_has_layer(&result->vdata, CD_MDEFORMVERT)) {
-    MDeformVert *dvert = BKE_mesh_deform_verts_for_write(me);
+    MDeformVert *dvert = BKE_mesh_deform_verts_for_write(result);
     BKE_object_defgroup_index_map_apply(&dvert[cap_verts_index], cap_nverts, remap, remap_len);
   }
 
diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc
index e436148ae8f..aadbb5732e8 100644
--- a/source/blender/modifiers/intern/MOD_boolean.cc
+++ b/source/blender/modifiers/intern/MOD_boolean.cc
@@ -144,7 +144,6 @@ static Mesh *get_quick_mesh(
           invert_m4_m4(imat, ob_self->obmat);
           mul_m4_m4m4(omat, imat, ob_operand_ob->obmat);
 
-          const int mverts_len = result->totvert;
           MutableSpan<MVert> vertices = blender::bke::mesh_vertices_for_write(*result);
           for (const int i : vertices.index_range()) {
             mul_m4_v3(omat, vertices[i].co);
diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c
index b58a5db52ed..ec3bbbd1b48 100644
--- a/source/blender/modifiers/intern/MOD_build.c
+++ b/source/blender/modifiers/intern/MOD_build.c
@@ -99,8 +99,8 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, struct
 
   /* if there's at least one face, build based on faces */
   if (faces_dst_num) {
-    MPoly *mpoly, *mp;
-    MLoop *ml, *mloop;
+    const MPoly *mpoly, *mp;
+    const MLoop *ml, *mloop;
     uintptr_t hash_num, hash_num_alt;
 
     if (bmd->flag & MOD_BUILD_FLAG_RANDOMIZE) {
@@ -135,7 +135,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, struct
     hash_num = 0;
     hash_num_alt = 0;
     for (i = 0; i < edge_src_num; i++, hash_num_alt++) {
-      MEdge *me = medge_src + i;
+      const MEdge *me = medge_src + i;
 
       if (BLI_ghash_haskey(vertHash, POINTER_FROM_INT(me->v1)) &&
           BLI_ghash_haskey(vertHash, POINTER_FROM_INT(me->v2))) {
@@ -147,7 +147,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, struct
     BLI_assert(hash_num == BLI_ghash_len(edgeHash));
   }
   else if (edges_dst_num) {
-    MEdge *medge, *me;
+    const MEdge *medge, *me;
     uintptr_t hash_num;
 
     if (bmd->flag & MOD_BUILD_FLAG_RANDOMIZE) {
diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c
index 9ce85f5c731..8caee21d300 100644
--- a/source/blender/modifiers/intern/MOD_collision.c
+++ b/source/blender/modifiers/intern/MOD_collision.c
@@ -160,7 +160,7 @@ static void deformVerts(ModifierData *md,
       collmd->mvert_num = mvert_num;
 
       {
-        const MLoop *mloop = BKE_mesh_loop(mesh_src);
+        const MLoop *mloop = BKE_mesh_loops(mesh_src);
         const MLoopTri *looptri = BKE_mesh_runtime_looptri_ensure(mesh_src);
         collmd->tri_num = BKE_mesh_runtime_looptri_len(mesh_src);
         MVertTri *tri = MEM_mallocN(sizeof(*tri) * collmd->tri_num, __func__);
diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c
index 5b93eb3eae7..973e73ca108 100644
--- a/source/blender/modifiers/intern/MOD_correctivesmooth.c
+++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c
@@ -109,7 +109,7 @@ static void requiredDataMask(Object *UNUSED(ob),
 }
 
 /* check individual weights for changes and cache values */
-static void mesh_get_weights(MDeformVert *dvert,
+static void mesh_get_weights(const MDeformVert *dvert,
                              const int defgrp_index,
                              const uint verts_num,
                              const bool use_invert_vgroup,
@@ -358,7 +358,7 @@ static void smooth_iter(CorrectiveSmoothModifierData *csmd,
 
 static void smooth_verts(CorrectiveSmoothModifierData *csmd,
                          Mesh *mesh,
-                         MDeformVert *dvert,
+                         const MDeformVert *dvert,
                          const int defgrp_index,
                          float (*vertexCos)[3],
                          uint verts_num)
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c
index e0b74425a11..2ebcad5c98b 100644
--- a/source/blender/modifiers/intern/MOD_datatransfer.c
+++ b/source/blender/modifiers/intern/MOD_datatransfer.c
@@ -22,6 +22,7 @@
 #include "BKE_data_transfer.h"
 #include "BKE_lib_id.h"
 #include "BKE_lib_query.h"
+#include "BKE_mesh.h"
 #include "BKE_mesh_mapping.h"
 #include "BKE_mesh_remap.h"
 #include "BKE_modifier.h"
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index be9df694687..badde4fabb4 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -150,7 +150,7 @@ typedef struct DisplaceUserdata {
   /*const*/ DisplaceModifierData *dmd;
   struct Scene *scene;
   struct ImagePool *pool;
-  MDeformVert *dvert;
+  const MDeformVert *dvert;
   float weight;
   int defgrp_index;
   int direction;
@@ -170,7 +170,7 @@ static void displaceModifier_do_task(void *__restrict userdata,
 {
   DisplaceUserdata *data = (DisplaceUserdata *)userdata;
   DisplaceModifierData *dmd = data->dmd;
-  MDeformVert *dvert = data->dvert;
+  const MDeformVert *dvert = data->dvert;
   const bool invert_vgroup = (dmd->flag & MOD_DISP_INVERT_VGROUP) != 0;
   float weight = data->weight;
   int defgrp_index = data->defgrp_index;
diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c
index 979a1b72a81..be65534c54f 100644
--- a/source/blender/modifiers/intern/MOD_explode.c
+++ b/source/blender/modifiers/intern/MOD_explode.c
@@ -216,7 +216,8 @@ static const short add_faces[24] = {
 
 static MFace *get_dface(Mesh *mesh, Mesh *split, int cur, int i, MFace *mf)
 {
-  MFace *df = &split->mface[cur];
+  MFace *mfaces = CustomData_get_layer(&split->fdata, CD_MFACE);
+  MFace *df = &mfaces[cur];
   CustomData_copy_data(&mesh->fdata, &split->fdata, i, cur, 1);
   *df = *mf;
   return df;
@@ -639,7 +640,7 @@ static Mesh *cutEdges(ExplodeModifierData *emd, Mesh *mesh)
 {
   Mesh *split_m;
   MFace *mf = NULL, *df1 = NULL;
-  MFace *mface = mesh->mface;
+  MFace *mface = CustomData_get_layer(&mesh->fdata, CD_MFACE);
   MVert *dupve, *mv;
   EdgeHash *edgehash;
   EdgeHashIterator *ehi;
@@ -775,7 +776,7 @@ static Mesh *cutEdges(ExplodeModifierData *emd, Mesh *mesh)
   curdupface = 0;  //=totface;
   // curdupin=totesplit;
   for (i = 0, fs = facesplit; i < totface; i++, fs++) {
-    mf = &mesh->mface[i];
+    mf = &mface[i];
 
     switch (*fs) {
       case 3:
@@ -879,8 +880,9 @@ static Mesh *cutEdges(ExplodeModifierData *emd, Mesh *mesh)
     curdupface += add_faces[*fs] + 1;
   }
 
+  MFace *split_mface = CustomData_get_layer(&split_m->fdata, CD_MFACE);
   for (i = 0; i < curdupface; i++) {
-    mf = &split_m->mface[i];
+    mf = &split_mface[i];
     BKE_mesh_mface_index_validate(mf, &split_m->fdata, i, ((mf->flag & ME_FACE_SEL) ? 4 : 3));
   }
 
@@ -918,7 +920,7 @@ static Mesh *explodeMesh(ExplodeModifierData *emd,
 
   totface = mesh->totface;
   totvert = mesh->totvert;
-  mface = mesh->mface;
+  mface = CustomData_get_layer(&mesh->fdata, CD_MFACE);
   totpart = psmd->psys->totpart;
 
   sim.depsgraph = ctx->depsgraph;
@@ -987,6 +989,7 @@ static Mesh *explodeMesh(ExplodeModifierData *emd,
 
   psmd->psys->lattice_deform_data = psys_create_lattice_deform_data(&sim);
 
+  const MVert *mesh_vertices = BKE_mesh_vertices(mesh);
   MVert *explode_vertices = BKE_mesh_vertices_for_write(explode);
 
   /* duplicate & displace vertices */
@@ -1040,6 +1043,7 @@ static Mesh *explodeMesh(ExplodeModifierData *emd,
   BLI_edgehashIterator_free(ehi);
 
   /* Map new vertices to faces. */
+  MFace *explode_mface = CustomData_get_layer(&explode->fdata, CD_MFACE);
   for (i = 0, u = 0; i < totface; i++) {
     MFace source;
     int orig_v4;
@@ -1061,8 +1065,8 @@ static Mesh *explodeMesh(ExplodeModifierData *emd,
       pa = NULL;
     }
 
-    source = mesh->mface[i];
-    mf = &explode->mface[u];
+    source = mface[i];
+    mf = &explode_mface[u];
 
     orig_v4 = source.v4;
 
diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c
index 54833cf72cb..763370ab242 100644
--- a/source/blender/modifiers/intern/MOD_meshcache.c
+++ b/source/blender/modifiers/intern/MOD_meshcache.c
@@ -182,7 +182,7 @@ static void meshcache_do(MeshCacheModifierData *mcmd,
       float(*vertexCos_Source)[3] = MEM_malloc_arrayN(
           verts_num, sizeof(*vertexCos_Source), __func__);
       float(*vertexCos_New)[3] = MEM_malloc_arrayN(verts_num, sizeof(*vertexCos_New), __func__);
-      MVert *mv = BKE_mesh_vertices(me);
+      const MVert *mv = BKE_mesh_vertices(me);
 
       for (i = 0; i < verts_num; i++, mv++) {
         copy_v3_v3(vertexCos_Source[i], mv->co);