[Bf-blender-cvs] [2ed302b5e13] refactor-mesh-position-generic: Merge branch 'master' into refactor-mesh-position-generic

[Hans Goudey]

Commit: 2ed302b5e13111b62b37cdd6a1d081e818f1574b
Author: Hans Goudey
Date:   Fri Oct 7 16:45:12 2022 -0500
Branches: refactor-mesh-position-generic
https://developer.blender.org/rB2ed302b5e13111b62b37cdd6a1d081e818f1574b

Merge branch 'master' into refactor-mesh-position-generic

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



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

diff --cc source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
index bead9bf7b8a,8d1171097b8..c8db35e4ed2
--- a/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
+++ b/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc
@@@ -97,10 -97,10 +97,10 @@@ class obj_importer_test : public Blendf
          EXPECT_EQ(mesh->totedge, exp.mesh_totedge_or_curve_endp);
          EXPECT_EQ(mesh->totpoly, exp.mesh_totpoly_or_curve_order);
          EXPECT_EQ(mesh->totloop, exp.mesh_totloop_or_curve_cyclic);
 -        const Span<MVert> verts = mesh->verts();
 -        EXPECT_V3_NEAR(verts.first().co, exp.vert_first, 0.0001f);
 -        EXPECT_V3_NEAR(verts.last().co, exp.vert_last, 0.0001f);
 +        const Span<float3> positions = mesh->positions();
 +        EXPECT_V3_NEAR(positions.first(), exp.vert_first, 0.0001f);
 +        EXPECT_V3_NEAR(positions.last(), exp.vert_last, 0.0001f);
-         const float3 *lnors = (const float3 *)(CustomData_get_layer(&mesh->ldata, CD_NORMAL));
+         const float3 *lnors = (const float3 *)CustomData_get_layer(&mesh->ldata, CD_NORMAL);
          float3 normal_first = lnors != nullptr ? lnors[0] : float3(0, 0, 0);
          EXPECT_V3_NEAR(normal_first, exp.normal_first, 0.0001f);
          const MLoopUV *mloopuv = static_cast<const MLoopUV *>(
diff --cc source/blender/modifiers/intern/MOD_weighted_normal.cc
index b88eba701ac,e7b1cb45234..1c25236bf69
--- a/source/blender/modifiers/intern/MOD_weighted_normal.cc
+++ b/source/blender/modifiers/intern/MOD_weighted_normal.cc
@@@ -221,8 -221,8 +221,8 @@@ static void apply_weights_vertex_normal
      /* This will give us loop normal spaces,
       * we do not actually care about computed loop_normals for now... */
      loop_normals = static_cast<float(*)[3]>(
-         MEM_calloc_arrayN((size_t)loops_num, sizeof(*loop_normals), __func__));
+         MEM_calloc_arrayN(size_t(loops_num), sizeof(*loop_normals), __func__));
 -    BKE_mesh_normals_loop_split(mvert,
 +    BKE_mesh_normals_loop_split(positions,
                                  wn_data->vert_normals,
                                  verts_num,
                                  medge,
@@@ -404,9 -404,9 +404,9 @@@
      }
      else {
        loop_normals = static_cast<float(*)[3]>(
-           MEM_calloc_arrayN((size_t)loops_num, sizeof(*loop_normals), __func__));
+           MEM_calloc_arrayN(size_t(loops_num), sizeof(*loop_normals), __func__));
  
 -      BKE_mesh_normals_loop_split(mvert,
 +      BKE_mesh_normals_loop_split(positions,
                                    wn_data->vert_normals,
                                    verts_num,
                                    medge,
@@@ -499,8 -499,8 +499,8 @@@ static void wn_corner_angle(WeightedNor
      const MLoop *ml_start = &mloop[mp->loopstart];
  
      float *index_angle = static_cast<float *>(
-         MEM_malloc_arrayN((size_t)mp->totloop, sizeof(*index_angle), __func__));
+         MEM_malloc_arrayN(size_t(mp->totloop), sizeof(*index_angle), __func__));
 -    BKE_mesh_calc_poly_angles(mp, ml_start, mvert, index_angle);
 +    BKE_mesh_calc_poly_angles(mp, ml_start, positions, index_angle);
  
      ModePair *c_angl = &corner_angle[mp->loopstart];
      float *angl = index_angle;
@@@ -542,10 -542,10 +542,10 @@@ static void wn_face_with_angle(Weighted
    for (mp_index = 0, mp = mpoly; mp_index < polys_num; mp_index++, mp++) {
      const MLoop *ml_start = &mloop[mp->loopstart];
  
 -    float face_area = BKE_mesh_calc_poly_area(mp, ml_start, mvert);
 +    float face_area = BKE_mesh_calc_poly_area(mp, ml_start, positions);
      float *index_angle = static_cast<float *>(
-         MEM_malloc_arrayN((size_t)mp->totloop, sizeof(*index_angle), __func__));
+         MEM_malloc_arrayN(size_t(mp->totloop), sizeof(*index_angle), __func__));
 -    BKE_mesh_calc_poly_angles(mp, ml_start, mvert, index_angle);
 +    BKE_mesh_calc_poly_angles(mp, ml_start, positions, index_angle);
  
      ModePair *cmbnd = &combined[mp->loopstart];
      float *angl = index_angle;