Merge branch 'master' into xr-devxr-dev

1 files changed, 6 insertions, 15 deletions

diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c
index 575182a846b..bc1a04d65ce 100644
--- a/source/blender/modifiers/intern/MOD_util.c
+++ b/source/blender/modifiers/intern/MOD_util.c
@@ -94,9 +94,9 @@ void MOD_get_texture_coords(MappingInfoModifierData *dmd,
   /* UVs need special handling, since they come from faces */
   if (texmapping == MOD_DISP_MAP_UV) {
     if (CustomData_has_layer(&mesh->ldata, CD_MLOOPUV)) {
-      MPoly *mpoly = mesh->mpoly;
-      MPoly *mp;
-      MLoop *mloop = mesh->mloop;
+      const MPoly *mpoly = BKE_mesh_polys(mesh);
+      const MPoly *mp;
+      const MLoop *mloop = BKE_mesh_loops(mesh);
       BLI_bitmap *done = BLI_BITMAP_NEW(verts_num, __func__);
       const int polys_num = mesh->totpoly;
       char uvname[MAX_CUSTOMDATA_LAYER_NAME];
@@ -130,7 +130,7 @@ void MOD_get_texture_coords(MappingInfoModifierData *dmd,
     texmapping = MOD_DISP_MAP_LOCAL;
   }
 
-  MVert *mv = mesh->mvert;
+  const MVert *mv = BKE_mesh_verts(mesh);
   for (i = 0; i < verts_num; i++, mv++, r_texco++) {
     switch (texmapping) {
       case MOD_DISP_MAP_LOCAL:
@@ -169,7 +169,6 @@ Mesh *MOD_deform_mesh_eval_get(Object *ob,
                                Mesh *mesh,
                                const float (*vertexCos)[3],
                                const int verts_num,
-                               const bool use_normals,
                                const bool use_orco)
 {
   if (mesh != NULL) {
@@ -217,14 +216,6 @@ Mesh *MOD_deform_mesh_eval_get(Object *ob,
     }
   }
 
-  /* TODO: Remove this "use_normals" argument, since the caller should retrieve normals afterwards
-   * if necessary. */
-  if (use_normals) {
-    if (LIKELY(mesh)) {
-      BKE_mesh_vertex_normals_ensure(mesh);
-    }
-  }
-
   if (mesh && mesh->runtime.wrapper_type == ME_WRAPPER_TYPE_MDATA) {
     BLI_assert(mesh->totvert == verts_num);
   }
@@ -233,12 +224,12 @@ Mesh *MOD_deform_mesh_eval_get(Object *ob,
 }
 
 void MOD_get_vgroup(
-    Object *ob, struct Mesh *mesh, const char *name, MDeformVert **dvert, int *defgrp_index)
+    Object *ob, struct Mesh *mesh, const char *name, const MDeformVert **dvert, int *defgrp_index)
 {
   if (mesh) {
     *defgrp_index = BKE_id_defgroup_name_index(&mesh->id, name);
     if (*defgrp_index != -1) {
-      *dvert = mesh->dvert;
+      *dvert = BKE_mesh_deform_verts(mesh);
     }
     else {
       *dvert = NULL;