[Bf-blender-cvs] [f3eb3012d35] refactor-mesh-remove-pointers: Fix use of deprecated pointers

[Hans Goudey]

Commit: f3eb3012d353817ab58c96e9beabecd0e9f2f7b5
Author: Hans Goudey
Date:   Tue Aug 30 13:50:06 2022 -0500
Branches: refactor-mesh-remove-pointers
https://developer.blender.org/rBf3eb3012d353817ab58c96e9beabecd0e9f2f7b5

Fix use of deprecated pointers

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

M	source/blender/blenkernel/intern/mesh_convert.cc
M	source/blender/blenkernel/intern/mesh_runtime.cc

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

diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc
index 71a7adbce7c..f44197faf71 100644
--- a/source/blender/blenkernel/intern/mesh_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_convert.cc
@@ -81,7 +81,8 @@ static void make_edges_mdata_extend(Mesh &mesh)
   const MPoly *mp;
   int i;
 
-  Span<MPoly> polys = blender::bke::mesh_polygons(mesh);
+  MutableSpan<MEdge> edges = blender::bke::mesh_edges_for_write(mesh);
+  const Span<MPoly> polys = blender::bke::mesh_polygons(mesh);
   MutableSpan<MLoop> loops = blender::bke::mesh_loops_for_write(mesh);
 
   const int eh_reserve = max_ii(totedge, BLI_EDGEHASH_SIZE_GUESS_FROM_POLYS(mesh.totpoly));
@@ -96,9 +97,8 @@ static void make_edges_mdata_extend(Mesh &mesh)
 #ifdef DEBUG
   /* ensure that there's no overlap! */
   if (totedge_new) {
-    MEdge *medge = mesh.medge;
-    for (i = 0; i < totedge; i++, medge++) {
-      BLI_assert(BLI_edgehash_haskey(eh, medge->v1, medge->v2) == false);
+    for (const MEdge &edge : edges) {
+      BLI_assert(BLI_edgehash_haskey(eh, edge.v1, edge.v2) == false);
     }
   }
 #endif
@@ -106,7 +106,7 @@ static void make_edges_mdata_extend(Mesh &mesh)
   if (totedge_new) {
     CustomData_realloc(&mesh.edata, totedge + totedge_new);
 
-    MEdge *medge = &blender::bke::mesh_edges_for_write(mesh)[totedge];
+    MEdge *medge = &edges[totedge];
 
     mesh.totedge += totedge_new;
 
diff --git a/source/blender/blenkernel/intern/mesh_runtime.cc b/source/blender/blenkernel/intern/mesh_runtime.cc
index e4b9dd22f12..84440bd6e3c 100644
--- a/source/blender/blenkernel/intern/mesh_runtime.cc
+++ b/source/blender/blenkernel/intern/mesh_runtime.cc
@@ -355,7 +355,7 @@ bool BKE_mesh_runtime_is_valid(Mesh *me_eval)
       verts.size(),
       edges.data(),
       edges.size(),
-      me_eval->mface,
+      static_cast<MFace *>(CustomData_get_layer(&me_eval->fdata, CD_MFACE)),
       me_eval->totface,
       loops.data(),
       loops.size(),