1 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/editors/transform/transform_snap_object.cc b/source/blender/editors/transform/transform_snap_object.cc
index 90a13722b63..f2711db5011 100644
--- a/source/blender/editors/transform/transform_snap_object.cc
+++ b/source/blender/editors/transform/transform_snap_object.cc
@@ -105,7 +105,7 @@ struct SnapData_EditMesh {
   /* Looptris. */
   BVHTreeFromEditMesh treedata_editmesh;
 
-  struct Mesh_Runtime *mesh_runtime;
+  blender::bke::MeshRuntime *mesh_runtime;
   float min[3], max[3];
 
   void clear()
@@ -189,14 +189,14 @@ static const Mesh *mesh_for_snap(Object *ob_eval, eSnapEditType edit_mode_type,
     const Mesh *editmesh_eval_cage = BKE_object_get_editmesh_eval_cage(ob_eval);
 
     if ((edit_mode_type == SNAP_GEOM_FINAL) && editmesh_eval_final) {
-      if (editmesh_eval_final->runtime.wrapper_type == ME_WRAPPER_TYPE_BMESH) {
+      if (editmesh_eval_final->runtime->wrapper_type == ME_WRAPPER_TYPE_BMESH) {
         return nullptr;
       }
       me_eval = editmesh_eval_final;
       use_hide = true;
     }
     else if ((edit_mode_type == SNAP_GEOM_CAGE) && editmesh_eval_cage) {
-      if (editmesh_eval_cage->runtime.wrapper_type == ME_WRAPPER_TYPE_BMESH) {
+      if (editmesh_eval_cage->runtime->wrapper_type == ME_WRAPPER_TYPE_BMESH) {
         return nullptr;
       }
       me_eval = editmesh_eval_cage;
@@ -253,21 +253,21 @@ static SnapData_Mesh *snap_object_data_mesh_get(SnapObjectContext *sctx,
     sod = sod_p->get();
     bool is_dirty = false;
     if (sod->treedata_mesh.tree && sod->treedata_mesh.cached &&
-        !bvhcache_has_tree(me_eval->runtime.bvh_cache, sod->treedata_mesh.tree)) {
+        !bvhcache_has_tree(me_eval->runtime->bvh_cache, sod->treedata_mesh.tree)) {
       /* The tree is owned by the Mesh and may have been freed since we last used. */
       is_dirty = true;
     }
     else if (sod->bvhtree[0] && sod->cached[0] &&
-             !bvhcache_has_tree(me_eval->runtime.bvh_cache, sod->bvhtree[0])) {
+             !bvhcache_has_tree(me_eval->runtime->bvh_cache, sod->bvhtree[0])) {
       /* The tree is owned by the Mesh and may have been freed since we last used. */
       is_dirty = true;
     }
     else if (sod->bvhtree[1] && sod->cached[1] &&
-             !bvhcache_has_tree(me_eval->runtime.bvh_cache, sod->bvhtree[1])) {
+             !bvhcache_has_tree(me_eval->runtime->bvh_cache, sod->bvhtree[1])) {
       /* The tree is owned by the Mesh and may have been freed since we last used. */
       is_dirty = true;
     }
-    else if (sod->treedata_mesh.looptri != me_eval->runtime.looptris.array) {
+    else if (sod->treedata_mesh.looptri != me_eval->looptris().data()) {
       is_dirty = true;
     }
     else if (sod->treedata_mesh.vert != verts.data()) {
@@ -330,19 +330,19 @@ static SnapData_Mesh *snap_object_data_mesh_get(SnapObjectContext *sctx,
 
 /* Searches for the #Mesh_Runtime associated with the object that is most likely to be updated due
  * to changes in the `edit_mesh`. */
-static Mesh_Runtime *snap_object_data_editmesh_runtime_get(Object *ob_eval)
+static blender::bke::MeshRuntime *snap_object_data_editmesh_runtime_get(Object *ob_eval)
 {
   Mesh *editmesh_eval_final = BKE_object_get_editmesh_eval_final(ob_eval);
   if (editmesh_eval_final) {
-    return &editmesh_eval_final->runtime;
+    return editmesh_eval_final->runtime;
   }
 
   Mesh *editmesh_eval_cage = BKE_object_get_editmesh_eval_cage(ob_eval);
   if (editmesh_eval_cage) {
-    return &editmesh_eval_cage->runtime;
+    return editmesh_eval_cage->runtime;
   }
 
-  return &((Mesh *)ob_eval->data)->runtime;
+  return ((Mesh *)ob_eval->data)->runtime;
 }
 
 static SnapData_EditMesh *snap_object_data_editmesh_get(SnapObjectContext *sctx,