1 files changed, 21 insertions, 14 deletions

diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index f82d6f6164b..1aa3f2cc54a 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -14,6 +14,8 @@
 
 #include <sstream>
 
+using blender::Span;
+
 namespace Freestyle {
 
 BlenderFileLoader::BlenderFileLoader(Render *re, ViewLayer *view_layer, Depsgraph *depsgraph)
@@ -378,9 +380,12 @@ int BlenderFileLoader::testDegenerateTriangle(float v1[3], float v2[3], float v3
 
 static bool testEdgeMark(Mesh *me, const FreestyleEdge *fed, const MLoopTri *lt, int i)
 {
-  MLoop *mloop = &me->mloop[lt->tri[i]];
-  MLoop *mloop_next = &me->mloop[lt->tri[(i + 1) % 3]];
-  MEdge *medge = &me->medge[mloop->e];
+  const Span<MEdge> edges = me->edges();
+  const Span<MLoop> loops = me->loops();
+
+  const MLoop *mloop = &loops[lt->tri[i]];
+  const MLoop *mloop_next = &loops[lt->tri[(i + 1) % 3]];
+  const MEdge *medge = &edges[mloop->e];
 
   if (!ELEM(mloop_next->v, medge->v1, medge->v2)) {
     /* Not an edge in the original mesh before triangulation. */
@@ -394,10 +399,15 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id)
 {
   char *name = ob->id.name + 2;
 
+  const Span<MVert> mesh_verts = me->vertices();
+  const Span<MPoly> mesh_polys = me->polygons();
+  const Span<MLoop> mesh_loops = me->loops();
+
   // Compute loop triangles
   int tottri = poly_to_tri_count(me->totpoly, me->totloop);
   MLoopTri *mlooptri = (MLoopTri *)MEM_malloc_arrayN(tottri, sizeof(*mlooptri), __func__);
-  BKE_mesh_recalc_looptri(me->mloop, me->mpoly, me->mvert, me->totloop, me->totpoly, mlooptri);
+  BKE_mesh_recalc_looptri(
+      mesh_loops.data(), mesh_polys.data(), mesh_verts.data(), me->totloop, me->totpoly, mlooptri);
 
   // Compute loop normals
   BKE_mesh_calc_normals_split(me);
@@ -408,9 +418,6 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id)
   }
 
   // Get other mesh data
-  MVert *mvert = me->mvert;
-  MLoop *mloop = me->mloop;
-  MPoly *mpoly = me->mpoly;
   const FreestyleEdge *fed = (FreestyleEdge *)CustomData_get_layer(&me->edata, CD_FREESTYLE_EDGE);
   const FreestyleFace *ffa = (FreestyleFace *)CustomData_get_layer(&me->pdata, CD_FREESTYLE_FACE);
 
@@ -435,9 +442,9 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id)
   for (int a = 0; a < tottri; a++) {
     const MLoopTri *lt = &mlooptri[a];
 
-    copy_v3_v3(v1, mvert[mloop[lt->tri[0]].v].co);
-    copy_v3_v3(v2, mvert[mloop[lt->tri[1]].v].co);
-    copy_v3_v3(v3, mvert[mloop[lt->tri[2]].v].co);
+    copy_v3_v3(v1, mesh_verts[mesh_loops[lt->tri[0]].v].co);
+    copy_v3_v3(v2, mesh_verts[mesh_loops[lt->tri[1]].v].co);
+    copy_v3_v3(v3, mesh_verts[mesh_loops[lt->tri[2]].v].co);
 
     mul_m4_v3(obmat, v1);
     mul_m4_v3(obmat, v2);
@@ -506,12 +513,12 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id)
   // by the near and far view planes.
   for (int a = 0; a < tottri; a++) {
     const MLoopTri *lt = &mlooptri[a];
-    const MPoly *mp = &mpoly[lt->poly];
+    const MPoly *mp = &mesh_polys[lt->poly];
     Material *mat = BKE_object_material_get(ob, material_indices[lt->poly] + 1);
 
-    copy_v3_v3(v1, mvert[mloop[lt->tri[0]].v].co);
-    copy_v3_v3(v2, mvert[mloop[lt->tri[1]].v].co);
-    copy_v3_v3(v3, mvert[mloop[lt->tri[2]].v].co);
+    copy_v3_v3(v1, mesh_verts[mesh_loops[lt->tri[0]].v].co);
+    copy_v3_v3(v2, mesh_verts[mesh_loops[lt->tri[1]].v].co);
+    copy_v3_v3(v3, mesh_verts[mesh_loops[lt->tri[2]].v].co);
 
     mul_m4_v3(obmat, v1);
     mul_m4_v3(obmat, v2);