[Bf-blender-cvs] [4cdddcca87b] refactor-mesh-corners-generic: Small cleanups

[Hans Goudey]

Commit: 4cdddcca87b79e0311ee74d1e0dfd91cf724e1d0
Author: Hans Goudey
Date:   Mon Dec 12 08:50:53 2022 -0600
Branches: refactor-mesh-corners-generic
https://developer.blender.org/rB4cdddcca87b79e0311ee74d1e0dfd91cf724e1d0

Small cleanups

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

M	intern/cycles/blender/mesh.cpp
M	source/blender/blenkernel/intern/data_transfer.cc
M	source/blender/blenkernel/intern/mesh_normals.cc

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

diff --git a/intern/cycles/blender/mesh.cpp b/intern/cycles/blender/mesh.cpp
index d0a98fca5ff..2dee09f7188 100644
--- a/intern/cycles/blender/mesh.cpp
+++ b/intern/cycles/blender/mesh.cpp
@@ -886,7 +886,7 @@ static void attr_create_random_per_island(Scene *scene,
       BL::IntAttribute corner_verts = *find_corner_vert_attribute(b_mesh);
       for (int i = 0; i < polys_num; i++) {
         const MPoly &b_poly = polys[i];
-        const int vert = corner_verts->data[b_poly.loopstart].value();
+        const int vert = corner_verts.data[b_poly.loopstart].value();
         data[i] = hash_uint_to_float(vertices_sets.find(vert));
       }
     }
diff --git a/source/blender/blenkernel/intern/data_transfer.cc b/source/blender/blenkernel/intern/data_transfer.cc
index be9eeb699ad..28fbaf5a84d 100644
--- a/source/blender/blenkernel/intern/data_transfer.cc
+++ b/source/blender/blenkernel/intern/data_transfer.cc
@@ -291,8 +291,8 @@ static void data_transfer_dtdata_type_preprocess(Mesh *me_src,
                                   num_verts_dst,
                                   edges_dst,
                                   num_edges_dst,
-                                  BKE_mesh_corner_verts(me_dst),
-                                  BKE_mesh_corner_edges(me_dst),
+                                  me_dst->corner_verts().data(),
+                                  me_dst->corner_edges().data(),
                                   loop_nors_dst,
                                   num_loops_dst,
                                   polys_dst,
@@ -346,8 +346,8 @@ static void data_transfer_dtdata_type_postprocess(Object *UNUSED(ob_src),
                                      num_verts_dst,
                                      edges_dst,
                                      num_edges_dst,
-                                     BKE_mesh_corner_verts(me_dst),
-                                     BKE_mesh_corner_edges(me_dst),
+                                     me_dst->corner_verts().data(),
+                                     me_dst->corner_edges().data(),
                                      loop_nors_dst,
                                      num_loops_dst,
                                      polys_dst,
@@ -1513,8 +1513,8 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph,
       const int num_edges_dst = me_dst->totedge;
       const MPoly *polys_dst = BKE_mesh_polys(me_dst);
       const int num_polys_dst = me_dst->totpoly;
-      const int *corner_verts_dst = BKE_mesh_corner_verts(me_dst);
-      const int *corner_edges_dst = BKE_mesh_corner_edges(me_dst);
+      const int *corner_verts_dst = me_dst->corner_verts().data();
+      const int *corner_edges_dst = me_dst->corner_edges().data();
       const int num_loops_dst = me_dst->totloop;
       CustomData *ldata_dst = &me_dst->ldata;
 
@@ -1615,7 +1615,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph,
       const int num_verts_dst = me_dst->totvert;
       const MPoly *polys_dst = BKE_mesh_polys(me_dst);
       const int num_polys_dst = me_dst->totpoly;
-      const int *corner_verts_dst = BKE_mesh_corner_verts(me_dst);
+      const int *corner_verts_dst = me_dst->corner_verts().data();
       const int num_loops_dst = me_dst->totloop;
 
       if (!geom_map_init[PDATA]) {
diff --git a/source/blender/blenkernel/intern/mesh_normals.cc b/source/blender/blenkernel/intern/mesh_normals.cc
index 02f81ae98c9..4ba951461a0 100644
--- a/source/blender/blenkernel/intern/mesh_normals.cc
+++ b/source/blender/blenkernel/intern/mesh_normals.cc
@@ -1558,7 +1558,7 @@ void BKE_mesh_normals_loop_split(const float (*positions)[3],
   common_data.loopnors = {reinterpret_cast<float3 *>(r_loopnors), numLoops};
   common_data.clnors_data = {reinterpret_cast<short2 *>(clnors_data), clnors_data ? numLoops : 0};
   common_data.positions = {reinterpret_cast<const float3 *>(positions), numVerts};
-  common_data.edges = {const_cast<MEdge *>(medges), numEdges};
+  common_data.edges = {medges, numEdges};
   common_data.polys = {mpolys, numPolys};
   common_data.corner_verts = {corner_verts, numLoops};
   common_data.corner_edges = {corner_edges, numLoops};