Progress

19 files changed, 111 insertions, 109 deletions

diff --git a/source/blender/modifiers/intern/MOD_build.c b/source/blender/modifiers/intern/MOD_build.c
index ec3bbbd1b48..4c27fe60546 100644
--- a/source/blender/modifiers/intern/MOD_build.c
+++ b/source/blender/modifiers/intern/MOD_build.c
@@ -62,7 +62,8 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, struct
   int *vertMap, *edgeMap, *faceMap;
   float frac;
   MPoly *mpoly_dst;
-  MLoop *ml_dst, *ml_src /*, *mloop_dst */;
+  MLoop *ml_dst;
+  const MLoop *ml_src;
   GHashIterator gh_iter;
   /* maps vert indices in old mesh to indices in new mesh */
   GHash *vertHash = BLI_ghash_int_new("build ve apply gh");
@@ -242,7 +243,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, struct
   /* copy the faces across, remapping indices */
   k = 0;
   for (i = 0; i < faces_dst_num; i++) {
-    MPoly *source;
+    const MPoly *source;
     MPoly *dest;
 
     source = mpoly_src + faceMap[i];
diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c
index 973e73ca108..907e3c0ca10 100644
--- a/source/blender/modifiers/intern/MOD_correctivesmooth.c
+++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c
@@ -519,7 +519,7 @@ static bool cache_settings_equal(CorrectiveSmoothModifierData *csmd)
  */
 static void calc_deltas(CorrectiveSmoothModifierData *csmd,
                         Mesh *mesh,
-                        MDeformVert *dvert,
+                        const MDeformVert *dvert,
                         const int defgrp_index,
                         const float (*rest_coords)[3],
                         uint verts_num)
diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c
index 763370ab242..023a3e79dba 100644
--- a/source/blender/modifiers/intern/MOD_meshcache.c
+++ b/source/blender/modifiers/intern/MOD_meshcache.c
@@ -257,7 +257,7 @@ static void meshcache_do(MeshCacheModifierData *mcmd,
         const float global_offset = (mcmd->flag & MOD_MESHCACHE_INVERT_VERTEX_GROUP) ?
                                         mcmd->factor :
                                         0.0f;
-        if (mesh->dvert != NULL) {
+        if (BKE_mesh_deform_verts(mesh) != NULL) {
           for (int i = 0; i < verts_num; i++) {
             /* For each vertex, compute its blending factor between the mesh cache (for `fac = 0`)
              * and the former position of the vertex (for `fac = 1`). */
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.cc b/source/blender/modifiers/intern/MOD_meshsequencecache.cc
index 98d9de8a2bd..44d7b42a746 100644
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.cc
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.cc
@@ -60,6 +60,8 @@
 #  include "usd.h"
 #endif
 
+using blender::Span;
+
 static void initData(ModifierData *md)
 {
   MeshSeqCacheModifierData *mcmd = reinterpret_cast<MeshSeqCacheModifierData *>(md);
diff --git a/source/blender/modifiers/intern/MOD_normal_edit.c b/source/blender/modifiers/intern/MOD_normal_edit.c
index 81b831e4864..266a8974575 100644
--- a/source/blender/modifiers/intern/MOD_normal_edit.c
+++ b/source/blender/modifiers/intern/MOD_normal_edit.c
@@ -53,7 +53,7 @@ static void generate_vert_coordinates(Mesh *mesh,
 
   INIT_MINMAX(min_co, max_co);
 
-  MVert *mv = BKE_mesh_vertices(mesh);
+  const MVert *mv = BKE_mesh_vertices(mesh);
   for (int i = 0; i < mesh->totvert; i++, mv++) {
     copy_v3_v3(r_cos[i], mv->co);
     if (r_size != NULL && ob_center == NULL) {
@@ -117,13 +117,13 @@ static void generate_vert_coordinates(Mesh *mesh,
 
 /* Note this modifies nos_new in-place. */
 static void mix_normals(const float mix_factor,
-                        MDeformVert *dvert,
+                        const MDeformVert *dvert,
                         const int defgrp_index,
                         const bool use_invert_vgroup,
                         const float mix_limit,
                         const short mix_mode,
                         const int verts_num,
-                        MLoop *mloop,
+                        const MLoop *mloop,
                         float (*nos_old)[3],
                         float (*nos_new)[3],
                         const int loops_num)
@@ -175,11 +175,11 @@ static void mix_normals(const float mix_factor,
 static bool polygons_check_flip(MLoop *mloop,
                                 float (*nos)[3],
                                 CustomData *ldata,
-                                MPoly *mpoly,
+                                const MPoly *mpoly,
                                 float (*polynors)[3],
                                 const int polys_num)
 {
-  MPoly *mp;
+  const MPoly *mp;
   MDisps *mdisp = CustomData_get_layer(ldata, CD_MDISPS);
   int i;
   bool flipped = false;
@@ -225,7 +225,7 @@ static void normalEditModifier_do_radial(NormalEditModifierData *enmd,
                                          const int verts_num,
                                          MEdge *medge,
                                          const int edges_num,
-                                         const MLoop *mloop,
+                                         MLoop *mloop,
                                          const int loops_num,
                                          const MPoly *mpoly,
                                          const int polys_num)
@@ -279,7 +279,7 @@ static void normalEditModifier_do_radial(NormalEditModifierData *enmd,
     const float m2 = (b * b) / (a * a);
     const float n2 = (c * c) / (a * a);
 
-    MLoop *ml;
+    const MLoop *ml;
     float(*no)[3];
 
     /* We reuse cos to now store the ellipsoid-normal of the verts! */
@@ -362,7 +362,7 @@ static void normalEditModifier_do_directional(NormalEditModifierData *enmd,
                                               const int verts_num,
                                               MEdge *medge,
                                               const int edges_num,
-                                              const MLoop *mloop,
+                                              MLoop *mloop,
                                               const int loops_num,
                                               const MPoly *mpoly,
                                               const int polys_num)
@@ -515,7 +515,7 @@ static Mesh *normalEditModifier_do(NormalEditModifierData *enmd,
   const MVert *vertices = BKE_mesh_vertices(mesh);
   MEdge *edges = BKE_mesh_edges_for_write(mesh);
   const MPoly *polygons = BKE_mesh_polygons(mesh);
-  const MLoop *loops = BKE_mesh_loops(mesh);
+  MLoop *loops = BKE_mesh_loops_for_write(mesh);
 
   int defgrp_index;
   const MDeformVert *dvert;
diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c
index 5c5eb2c4910..3c53f4268b4 100644
--- a/source/blender/modifiers/intern/MOD_ocean.c
+++ b/source/blender/modifiers/intern/MOD_ocean.c
@@ -367,6 +367,7 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes
   cfra_for_cache -= omd->bakestart; /* shift to 0 based */
 
   MVert *vertices = BKE_mesh_vertices_for_write(result);
+  MPoly *polygons = BKE_mesh_polygons_for_write(result);
 
   /* add vcols before displacement - allows lookup based on position */
 
@@ -385,10 +386,9 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes
       }
 
       if (mloopcols) { /* unlikely to fail */
-        MPoly *mpolys = result->mpoly;
         MPoly *mp;
 
-        for (i = 0, mp = mpolys; i < polys_num; i++, mp++) {
+        for (i = 0, mp = polygons; i < polys_num; i++, mp++) {
           MLoop *ml = &mloops[mp->loopstart];
           MLoopCol *mlcol = &mloopcols[mp->loopstart];
 
diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c
index 9332f72cf96..330544353fb 100644
--- a/source/blender/modifiers/intern/MOD_particleinstance.c
+++ b/source/blender/modifiers/intern/MOD_particleinstance.c
@@ -351,7 +351,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
     /* set vertices coordinates */
     for (k = 0; k < totvert; k++) {
       ParticleKey state;
-      MVert *inMV;
+      const MVert *inMV;
       int vindex = p_skip * totvert + k;
       MVert *mv = mvert + vindex;
 
@@ -484,7 +484,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
     /* create polys and loops */
     for (k = 0; k < totpoly; k++) {
 
-      MPoly *inMP = orig_mpoly + k;
+      const MPoly *inMP = orig_mpoly + k;
       MPoly *mp = mpoly + p_skip * totpoly + k;
 
       CustomData_copy_data(&mesh->pdata, &result->pdata, k, p_skip * totpoly + k, 1);
@@ -492,7 +492,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
       mp->loopstart += p_skip * totloop;
 
       {
-        MLoop *inML = orig_mloop + inMP->loopstart;
+        const MLoop *inML = orig_mloop + inMP->loopstart;
         MLoop *ml = mloop + mp->loopstart;
         int j = mp->totloop;
 
diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c
index 969752f526e..624c8866f88 100644
--- a/source/blender/modifiers/intern/MOD_remesh.c
+++ b/source/blender/modifiers/intern/MOD_remesh.c
@@ -97,8 +97,8 @@ static void *dualcon_alloc_output(int totvert, int totquad)
 
   output->mesh = BKE_mesh_new_nomain(totvert, 0, 0, 4 * totquad, totquad);
   output->vertices = BKE_mesh_vertices_for_write(output->mesh);
-  output->polygons = BKE_mesh_polygons_for_write(mesh);
-  output->loops = BKE_mesh_loops_for_write(mesh);
+  output->polygons = BKE_mesh_polygons_for_write(output->mesh);
+  output->loops = BKE_mesh_loops_for_write(output->mesh);
 
   return output;
 }
@@ -106,9 +106,8 @@ static void *dualcon_alloc_output(int totvert, int totquad)
 static void dualcon_add_vert(void *output_v, const float co[3])
 {
   DualConOutput *output = output_v;
-  Mesh *mesh = output->mesh;
 
-  BLI_assert(output->curvert < mesh->totvert);
+  BLI_assert(output->curvert < output->mesh->totvert);
 
   copy_v3_v3(output->vertices[output->curvert].co, co);
   output->curvert++;
@@ -201,7 +200,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *UNUSED(ctx)
   }
 
   if (rmd->flag & MOD_REMESH_SMOOTH_SHADING) {
-    MPoly *mpoly = result->mpoly;
+    MPoly *mpoly = BKE_mesh_polygons_for_write(result);
     int i, totpoly = result->totpoly;
 
     /* Apply smooth shading to output faces */
diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c
index 05009dcc53e..662ef2bb852 100644
--- a/source/blender/modifiers/intern/MOD_screw.c
+++ b/source/blender/modifiers/intern/MOD_screw.c
@@ -16,7 +16,7 @@
 
 #include "BLT_translation.h"
 
-// #include "DNA_defaults.h"
+#include "DNA_defaults.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
@@ -31,7 +31,7 @@
 #include "UI_resources.h"
 
 #include "RNA_access.h"
-// #include "RNA_prototypes.h"
+#include "RNA_prototypes.h"
 
 #include "DEG_depsgraph_build.h"
 #include "DEG_depsgraph_query.h"
@@ -236,11 +236,11 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
 
   uint edge_offset;
 
-  MPoly *mpoly_orig, *mpoly_new, *mp_new;
-  MLoop *mloop_orig, *mloop_new, *ml_new;
-  MEdge *medge_orig, *med_orig, *med_new, *med_new_firstloop, *medge_new;
-  MVert *mvert_new, *mvert_orig, *mv_orig, *mv_new, *mv_new_base;
-
+  MPoly *mp_new;
+  MLoop *ml_new;
+  MEdge *med_new, *med_new_firstloop;
+  MVert *mv_new, *mv_new_base;
+  const MVert *mv_orig;
   Object *ob_axis = ltmd->ob_axis;
 
   ScrewVertConnect *vc, *vc_tmp, *vert_connect = NULL;
@@ -383,15 +383,15 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
   result = BKE_mesh_new_nomain_from_template(
       mesh, (int)maxVerts, (int)maxEdges, 0, (int)maxPolys * 4, (int)maxPolys);
 
-  mvert_orig = BKE_mesh_vertices(mesh);
-  medge_orig = BKE_mesh_edges(mesh);
-  mpoly_orig = BKE_mesh_polygons(mesh);
-  mloop_orig = BKE_mesh_loops(mesh);
+  const MVert *mvert_orig = BKE_mesh_vertices(mesh);
+  const MEdge *medge_orig = BKE_mesh_edges(mesh);
+  const MPoly *mpoly_orig = BKE_mesh_polygons(mesh);
+  const MLoop *mloop_orig = BKE_mesh_loops(mesh);
 
-  mvert_new = BKE_mesh_vertices_for_write(result);
-  medge_new = BKE_mesh_edges_for_write(result);
-  mpoly_new = BKE_mesh_polygons_for_write(result);
-  mloop_new = BKE_mesh_loops_for_write(result);
+  MVert *mvert_new = BKE_mesh_vertices_for_write(result);
+  MEdge *medge_new = BKE_mesh_edges_for_write(result);
+  MPoly *mpoly_new = BKE_mesh_polygons_for_write(result);
+  MLoop *mloop_new = BKE_mesh_loops_for_write(result);
 
   if (!CustomData_has_layer(&result->pdata, CD_ORIGINDEX)) {
     CustomData_add_layer(&result->pdata, CD_ORIGINDEX, CD_CALLOC, NULL, (int)maxPolys);
@@ -434,7 +434,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
   BLI_bitmap *vert_tag = BLI_BITMAP_NEW(totvert, __func__);
 
   /* Copy the first set of edges */
-  med_orig = medge_orig;
+  const MEdge *med_orig = medge_orig;
   med_new = medge_new;
   for (i = 0; i < totedge; i++, med_orig++, med_new++) {
     med_new->v1 = med_orig->v1;
@@ -449,7 +449,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
 
   /* build polygon -> edge map */
   if (totpoly) {
-    MPoly *mp_orig;
+    const MPoly *mp_orig;
 
     edge_poly_map = MEM_malloc_arrayN(totedge, sizeof(*edge_poly_map), __func__);
     memset(edge_poly_map, 0xff, sizeof(*edge_poly_map) * totedge);
@@ -461,7 +461,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
       uint loopstart = (uint)mp_orig->loopstart;
       uint loopend = loopstart + (uint)mp_orig->totloop;
 
-      MLoop *ml_orig = &mloop_orig[loopstart];
+      const MLoop *ml_orig = &mloop_orig[loopstart];
       uint k;
       for (k = loopstart; k < loopend; k++, ml_orig++) {
         edge_poly_map[ml_orig->e] = i;
diff --git a/source/blender/modifiers/intern/MOD_smooth.c b/source/blender/modifiers/intern/MOD_smooth.c
index ff7c89cc44a..a6928c10101 100644
--- a/source/blender/modifiers/intern/MOD_smooth.c
+++ b/source/blender/modifiers/intern/MOD_smooth.c
@@ -128,7 +128,7 @@ static void smoothModifier_do(
 
     const short flag = smd->flag;
     if (dvert) {
-      MDeformVert *dv = dvert;
+      const MDeformVert *dv = dvert;
       for (int i = 0; i < verts_num; i++, dv++) {
         float *vco_orig = vertexCos[i];
         if (accumulated_vecs_count[i] > 0) {
diff --git a/source/blender/modifiers/intern/MOD_solidify_extrude.c b/source/blender/modifiers/intern/MOD_solidify_extrude.c
index 85d963210fd..a5c418bd325 100644
--- a/source/blender/modifiers/intern/MOD_solidify_extrude.c
+++ b/source/blender/modifiers/intern/MOD_solidify_extrude.c
@@ -152,10 +152,10 @@ Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md, const ModifierEvalContex
   Mesh *result;
   const SolidifyModifierData *smd = (SolidifyModifierData *)md;
 
-  MVert *mv, *mvert, *orig_mvert;
-  MEdge *ed, *medge, *orig_medge;
-  MLoop *ml, *mloop, *orig_mloop;
-  MPoly *mp, *mpoly, *orig_mpoly;
+  MVert *mv, *mvert;
+  MEdge *ed, *medge;
+  MLoop *ml, *mloop;
+  MPoly *mp, *mpoly;
   const uint verts_num = (uint)mesh->totvert;
   const uint edges_num = (uint)mesh->totedge;
   const uint polys_num = (uint)mesh->totpoly;
@@ -215,10 +215,10 @@ Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md, const ModifierEvalContex
 
   MOD_get_vgroup(ctx->object, mesh, smd->defgrp_name, &dvert, &defgrp_index);
 
-  orig_mvert = BKE_mesh_vertices(mesh);
-  orig_medge = BKE_mesh_edges(mesh);
-  orig_mloop = BKE_mesh_polygons(mesh);
-  orig_mpoly = BKE_mesh_loops(mesh);
+  const MVert *orig_mvert = BKE_mesh_vertices(mesh);
+  const MEdge *orig_medge = BKE_mesh_edges(mesh);
+  const MPoly *orig_mpoly = BKE_mesh_loops(mesh);
+  const MLoop *orig_mloop = BKE_mesh_polygons(mesh);
 
   if (need_poly_normals) {
     /* calculate only face normals */
@@ -560,7 +560,7 @@ Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md, const ModifierEvalContex
       for (i_orig = 0; i_orig < i_end; i_orig++, mv++) {
         const uint i = do_shell_align ? i_orig : new_vert_arr[i_orig];
         if (dvert) {
-          MDeformVert *dv = &dvert[i];
+          const MDeformVert *dv = &dvert[i];
           if (defgrp_invert) {
             ofs_new_vgroup = 1.0f - BKE_defvert_find_weight(dv, defgrp_index);
           }
@@ -611,7 +611,7 @@ Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md, const ModifierEvalContex
       for (i_orig = 0; i_orig < i_end; i_orig++, mv++) {
         const uint i = do_shell_align ? i_orig : new_vert_arr[i_orig];
         if (dvert) {
-          MDeformVert *dv = &dvert[i];
+          const MDeformVert *dv = &dvert[i];
           if (defgrp_invert) {
             ofs_new_vgroup = 1.0f - BKE_defvert_find_weight(dv, defgrp_index);
           }
@@ -754,7 +754,7 @@ Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md, const ModifierEvalContex
 
     /* vertex group support */
     if (dvert) {
-      MDeformVert *dv = dvert;
+      const MDeformVert *dv = dvert;
       float scalar;
 
       if (defgrp_invert) {
@@ -960,15 +960,15 @@ Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md, const ModifierEvalContex
 
   /* Add vertex weights for rim and shell vgroups. */
   if (shell_defgrp_index != -1 || rim_defgrp_index != -1) {
-    dvert = BKE_mesh_deform_verts_for_write(result);
+    const MDeformVert *dst_dvert = BKE_mesh_deform_verts_for_write(result);
 
     /* Ultimate security check. */
-    if (dvert != NULL) {
+    if (dst_dvert != NULL) {
 
       if (rim_defgrp_index != -1) {
         for (uint i = 0; i < rimVerts; i++) {
-          BKE_defvert_ensure_index(&dvert[new_vert_arr[i]], rim_defgrp_index)->weight = 1.0f;
-          BKE_defvert_ensure_index(&dvert[(do_shell ? new_vert_arr[i] : i) + verts_num],
+          BKE_defvert_ensure_index(&dst_dvert[new_vert_arr[i]], rim_defgrp_index)->weight = 1.0f;
+          BKE_defvert_ensure_index(&dst_dvert[(do_shell ? new_vert_arr[i] : i) + verts_num],
                                    rim_defgrp_index)
               ->weight = 1.0f;
         }
@@ -976,7 +976,7 @@ Mesh *MOD_solidify_extrude_modifyMesh(ModifierData *md, const ModifierEvalContex
 
       if (shell_defgrp_index != -1) {
         for (uint i = verts_num; i < result->totvert; i++) {
-          BKE_defvert_ensure_index(&dvert[i], shell_defgrp_index)->weight = 1.0f;
+          BKE_defvert_ensure_index(&dst_dvert[i], shell_defgrp_index)->weight = 1.0f;
         }
       }
     }
diff --git a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
index 46f005479f0..e848935c55d 100644
--- a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
+++ b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.c
@@ -137,10 +137,10 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md,
   Mesh *result;
   const SolidifyModifierData *smd = (SolidifyModifierData *)md;
 
-  MVert *mv, *mvert, *orig_mvert;
-  MEdge *ed, *medge, *orig_medge;
-  MLoop *ml, *mloop, *orig_mloop;
-  MPoly *mp, *mpoly, *orig_mpoly;
+  MVert *mv, *mvert;
+  MEdge *ed, *medge;
+  MLoop *ml, *mloop;
+  MPoly *mp, *mpoly;
   const uint verts_num = (uint)mesh->totvert;
   const uint edges_num = (uint)mesh->totedge;
   const uint polys_num = (uint)mesh->totpoly;
@@ -188,10 +188,10 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md,
 
   const bool do_flat_faces = dvert && (smd->flag & MOD_SOLIDIFY_NONMANIFOLD_FLAT_FACES);
 
-  orig_mvert = BKE_mesh_vertices(mesh);
-  orig_medge = BKE_mesh_edges(mesh);
-  orig_mloop = BKE_mesh_polygons(mesh);
-  orig_mpoly = BKE_mesh_loops(mesh);
+  const MVert *orig_mvert = BKE_mesh_vertices(mesh);
+  const MEdge *orig_medge = BKE_mesh_edges(mesh);
+  const MPoly *orig_mpoly = BKE_mesh_polygons(mesh);
+  const MLoop *orig_mloop = BKE_mesh_loops(mesh);
 
   uint new_verts_num = 0;
   uint new_edges_num = 0;
diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c
index 886912e27f9..f4a8a61e3e0 100644
--- a/source/blender/modifiers/intern/MOD_surface.c
+++ b/source/blender/modifiers/intern/MOD_surface.c
@@ -125,7 +125,6 @@ static void deformVerts(ModifierData *md,
   if (surmd->mesh) {
     uint mesh_verts_num = 0, i = 0;
     int init = 0;
-    float *vec;
     MVert *x, *v;
 
     BKE_mesh_vert_coords_apply(surmd->mesh, vertexCos);
@@ -152,9 +151,9 @@ static void deformVerts(ModifierData *md,
     }
 
     /* convert to global coordinates and calculate velocity */
-    const MVert *vertices = BKE_mesh_vertices(surmd->mesh);
+    MVert *vertices = BKE_mesh_vertices_for_write(surmd->mesh);
     for (i = 0, x = surmd->x, v = surmd->v; i < mesh_verts_num; i++, x++, v++) {
-      vec = vertices[i].co;
+      float *vec = vertices[i].co;
       mul_m4_v3(ctx->object->obmat, vec);
 
       if (init) {
diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c
index 1305db3b09d..1e204cc31d6 100644
--- a/source/blender/modifiers/intern/MOD_surfacedeform.c
+++ b/source/blender/modifiers/intern/MOD_surfacedeform.c
@@ -1175,7 +1175,7 @@ static bool surfacedeformBind(Object *ob,
   const MVert *mvert = BKE_mesh_vertices(target);
   const MPoly *mpoly = BKE_mesh_polygons(target);
   const MEdge *medge = BKE_mesh_edges(target);
-  const MLoop *mloop = BKE_Mesh_loops(target);
+  const MLoop *mloop = BKE_mesh_loops(target);
   uint tedges_num = target->totedge;
   int adj_result;
   SDefAdjacencyArray *vert_edges;
diff --git a/source/blender/modifiers/intern/MOD_uvproject.c b/source/blender/modifiers/intern/MOD_uvproject.c
index 5bec070db1b..8f69386d22c 100644
--- a/source/blender/modifiers/intern/MOD_uvproject.c
+++ b/source/blender/modifiers/intern/MOD_uvproject.c
@@ -214,7 +214,7 @@ static Mesh *uvprojectModifier_do(UVProjectModifierData *umd,
         uint fidx = mp->totloop - 1;
         do {
           uint lidx = mp->loopstart + fidx;
-          uint vidx = mloop[lidx].v;
+          uint vidx = loops[lidx].v;
           BLI_uvproject_from_camera(mloop_uv[lidx].uv, coords[vidx], projectors[0].uci);
         } while (fidx--);
       }
@@ -223,7 +223,7 @@ static Mesh *uvprojectModifier_do(UVProjectModifierData *umd,
         uint fidx = mp->totloop - 1;
         do {
           uint lidx = mp->loopstart + fidx;
-          uint vidx = mloop[lidx].v;
+          uint vidx = loops[lidx].v;
           copy_v2_v2(mloop_uv[lidx].uv, coords[vidx]);
         } while (fidx--);
       }
@@ -237,7 +237,7 @@ static Mesh *uvprojectModifier_do(UVProjectModifierData *umd,
 
       /* get the untransformed face normal */
       BKE_mesh_calc_poly_normal_coords(
-          mp, mloop + mp->loopstart, (const float(*)[3])coords, face_no);
+          mp, loops + mp->loopstart, (const float(*)[3])coords, face_no);
 
       /* find the projector which the face points at most directly
        * (projector normal with largest dot product is best)
@@ -257,7 +257,7 @@ static Mesh *uvprojectModifier_do(UVProjectModifierData *umd,
         uint fidx = mp->totloop - 1;
         do {
           uint lidx = mp->loopstart + fidx;
-          uint vidx = mloop[lidx].v;
+          uint vidx = loops[lidx].v;
           BLI_uvproject_from_camera(mloop_uv[lidx].uv, coords[vidx], best_projector->uci);
         } while (fidx--);
       }
@@ -265,7 +265,7 @@ static Mesh *uvprojectModifier_do(UVProjectModifierData *umd,
         uint fidx = mp->totloop - 1;
         do {
           uint lidx = mp->loopstart + fidx;
-          uint vidx = mloop[lidx].v;
+          uint vidx = loops[lidx].v;
           mul_v2_project_m4_v3(mloop_uv[lidx].uv, best_projector->projmat, coords[vidx]);
         } while (fidx--);
       }
diff --git a/source/blender/modifiers/intern/MOD_uvwarp.c b/source/blender/modifiers/intern/MOD_uvwarp.c
index 4f7bb97692e..66f4516c9e5 100644
--- a/source/blender/modifiers/intern/MOD_uvwarp.c
+++ b/source/blender/modifiers/intern/MOD_uvwarp.c
@@ -23,6 +23,7 @@
 #include "BKE_context.h"
 #include "BKE_deform.h"
 #include "BKE_lib_query.h"
+#include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_screen.h"
 
@@ -81,11 +82,11 @@ static void matrix_from_obj_pchan(float mat[4][4], Object *ob, const char *bonen
 }
 
 typedef struct UVWarpData {
-  MPoly *mpoly;
-  MLoop *mloop;
+  const MPoly *mpoly;
+  const MLoop *mloop;
   MLoopUV *mloopuv;
 
-  MDeformVert *dvert;
+  const MDeformVert *dvert;
   int defgrp_index;
 
   float (*warp_mat)[4];
diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.c b/source/blender/modifiers/intern/MOD_weighted_normal.c
index 600ebfb5013..8a157482da7 100644
--- a/source/blender/modifiers/intern/MOD_weighted_normal.c
+++ b/source/blender/modifiers/intern/MOD_weighted_normal.c
@@ -71,20 +71,20 @@ typedef struct WeightedNormalData {
   const int loops_num;
   const int polys_num;
 
-  MVert *mvert;
+  const MVert *mvert;
   const float (*vert_normals)[3];
-  MEdge *medge;
+  const MEdge *medge;
 
-  MLoop *mloop;
+  const MLoop *mloop;
   short (*clnors)[2];
   const bool has_clnors; /* True if clnors already existed, false if we had to create them. */
   const float split_angle;
 
-  MPoly *mpoly;
+  const MPoly *mpoly;
   const float (*polynors)[3];
   const int *poly_strength;
 
-  MDeformVert *dvert;
+  const MDeformVert *dvert;
   const int defgrp_index;
   const bool use_invert_vgroup;
 
@@ -133,7 +133,7 @@ static void aggregate_item_normal(WeightedNormalModifierData *wnmd,
 {
   const float(*polynors)[3] = wn_data->polynors;
 
-  MDeformVert *dvert = wn_data->dvert;
+  const MDeformVert *dvert = wn_data->dvert;
   const int defgrp_index = wn_data->defgrp_index;
   const bool use_invert_vgroup = wn_data->use_invert_vgroup;
 
@@ -186,18 +186,18 @@ static void apply_weights_vertex_normal(WeightedNormalModifierData *wnmd,
   const int loops_num = wn_data->loops_num;
   const int polys_num = wn_data->polys_num;
 
-  MVert *mvert = wn_data->mvert;
-  MEdge *medge = wn_data->medge;
+  const MVert *mvert = wn_data->mvert;
+  const MEdge *medge = wn_data->medge;
 
-  MLoop *mloop = wn_data->mloop;
+  const MLoop *mloop = wn_data->mloop;
   short(*clnors)[2] = wn_data->clnors;
   int *loop_to_poly = wn_data->loop_to_poly;
 
-  MPoly *mpoly = wn_data->mpoly;
+  const MPoly *mpoly = wn_data->mpoly;
   const float(*polynors)[3] = wn_data->polynors;
   const int *poly_strength = wn_data->poly_strength;
 
-  MDeformVert *dvert = wn_data->dvert;
+  const MDeformVert *dvert = wn_data->dvert;
 
   const short mode = wn_data->mode;
   ModePair *mode_pair = wn_data->mode_pair;
@@ -243,7 +243,7 @@ static void apply_weights_vertex_normal(WeightedNormalModifierData *wnmd,
 
     /* In this first loop, we assign each WeightedNormalDataAggregateItem
      * to its smooth fan of loops (aka lnor space). */
-    MPoly *mp;
+    const MPoly *mp;
     int mp_index;
     int item_index;
     for (mp = mpoly, mp_index = 0, item_index = 0; mp_index < polys_num; mp++, mp_index++) {
@@ -446,11 +446,11 @@ static void wn_face_area(WeightedNormalModifierData *wnmd, WeightedNormalData *w
 {
   const int polys_num = wn_data->polys_num;
 
-  MVert *mvert = wn_data->mvert;
-  MLoop *mloop = wn_data->mloop;
-  MPoly *mpoly = wn_data->mpoly;
+  const MVert *mvert = wn_data->mvert;
+  const MLoop *mloop = wn_data->mloop;
+  const MPoly *mpoly = wn_data->mpoly;
 
-  MPoly *mp;
+  const MPoly *mp;
   int mp_index;
 
   ModePair *face_area = MEM_malloc_arrayN((size_t)polys_num, sizeof(*face_area), __func__);
@@ -472,11 +472,11 @@ static void wn_corner_angle(WeightedNormalModifierData *wnmd, WeightedNormalData
   const int loops_num = wn_data->loops_num;
   const int polys_num = wn_data->polys_num;
 
-  MVert *mvert = wn_data->mvert;
-  MLoop *mloop = wn_data->mloop;
-  MPoly *mpoly = wn_data->mpoly;
+  const MVert *mvert = wn_data->mvert;
+  const MLoop *mloop = wn_data->mloop;
+  const MPoly *mpoly = wn_data->mpoly;
 
-  MPoly *mp;
+  const MPoly *mp;
   int mp_index;
 
   int *loop_to_poly = MEM_malloc_arrayN((size_t)loops_num, sizeof(*loop_to_poly), __func__);
@@ -513,11 +513,11 @@ static void wn_face_with_angle(WeightedNormalModifierData *wnmd, WeightedNormalD
   const int loops_num = wn_data->loops_num;
   const int polys_num = wn_data->polys_num;
 
-  MVert *mvert = wn_data->mvert;
-  MLoop *mloop = wn_data->mloop;
-  MPoly *mpoly = wn_data->mpoly;
+  const MVert *mvert = wn_data->mvert;
+  const MLoop *mloop = wn_data->mloop;
+  const MPoly *mpoly = wn_data->mpoly;
 
-  MPoly *mp;
+  const MPoly *mp;
   int mp_index;
 
   int *loop_to_poly = MEM_malloc_arrayN((size_t)loops_num, sizeof(*loop_to_poly), __func__);
@@ -525,7 +525,7 @@ static void wn_face_with_angle(WeightedNormalModifierData *wnmd, WeightedNormalD
   ModePair *combined = MEM_malloc_arrayN((size_t)loops_num, sizeof(*combined), __func__);
 
   for (mp_index = 0, mp = mpoly; mp_index < polys_num; mp_index++, mp++) {
-    MLoop *ml_start = &mloop[mp->loopstart];
+    const MLoop *ml_start = &mloop[mp->loopstart];
 
     float face_area = BKE_mesh_calc_poly_area(mp, ml_start, mvert);
     float *index_angle = MEM_malloc_arrayN((size_t)mp->totloop, sizeof(*index_angle), __func__);
@@ -579,11 +579,10 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
   const int edges_num = result->totedge;
   const int loops_num = result->totloop;
   const int polys_num = result->totpoly;
-
-  MVert *mvert = BKE_mesh_vertices(result);
-  MEdge *medge = BKE_mesh_edges(result);
-  MPoly *mpoly = BKE_mesh_polygons(result);
-  MLoop *mloop = BKE_mesh_loops(result);
+  const MVert *mvert = BKE_mesh_vertices(result);
+  const MEdge *medge = BKE_mesh_edges(result);
+  const MPoly *mpoly = BKE_mesh_polygons(result);
+  const MLoop *mloop = BKE_mesh_loops(result);
 
   /* Right now:
    * If weight = 50 then all faces are given equal weight.
diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.c b/source/blender/modifiers/intern/MOD_weightvgedit.c
index 7f7dad1c936..6506c9a8c75 100644
--- a/source/blender/modifiers/intern/MOD_weightvgedit.c
+++ b/source/blender/modifiers/intern/MOD_weightvgedit.c
@@ -27,6 +27,7 @@
 #include "BKE_context.h"
 #include "BKE_deform.h"
 #include "BKE_lib_query.h"
+#include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_screen.h"
 #include "BKE_texture.h" /* Texture masking. */
@@ -158,7 +159,6 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
 
   WeightVGEditModifierData *wmd = (WeightVGEditModifierData *)md;
 
-  MDeformVert *dvert = NULL;
   MDeformWeight **dw = NULL;
   float *org_w; /* Array original weights. */
   float *new_w; /* Array new weights. */
diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c
index 8ff476c025a..2ab84367627 100644
--- a/source/blender/modifiers/intern/MOD_weightvgmix.c
+++ b/source/blender/modifiers/intern/MOD_weightvgmix.c
@@ -23,6 +23,7 @@
 #include "BKE_customdata.h"
 #include "BKE_deform.h"
 #include "BKE_lib_query.h"
+#include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_screen.h"
 #include "BKE_texture.h" /* Texture masking. */