[Bf-blender-cvs] [ab62d9e2b73] refactor-mesh-remove-pointers: Merge branch 'master' into refactor-mesh-remove-pointers

[Hans Goudey]

Commit: ab62d9e2b734b97858faf19c1f217a9b4229ff9c
Author: Hans Goudey
Date:   Wed Aug 24 15:44:03 2022 -0400
Branches: refactor-mesh-remove-pointers
https://developer.blender.org/rBab62d9e2b734b97858faf19c1f217a9b4229ff9c

Merge branch 'master' into refactor-mesh-remove-pointers

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



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

diff --cc source/blender/makesrna/intern/rna_mesh.c
index 64c46440bf8,cd7badae80d..c6d49ec67d3
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@@ -494,9 -493,8 +493,7 @@@ static void rna_MeshLoop_tangent_get(Po
  {
    Mesh *me = rna_mesh(ptr);
    const int index = rna_MeshLoop_index_get(ptr);
- 
    const float(*vec)[4] = CustomData_get(&me->ldata, index, CD_MLOOPTANGENT);
--
    if (!vec) {
      zero_v3(values);
    }
@@@ -536,10 -532,8 +531,10 @@@ static void rna_MeshPolygon_normal_get(
  {
    Mesh *me = rna_mesh(ptr);
    MPoly *mp = (MPoly *)ptr->data;
-   const MVert *vertices = BKE_mesh_vertices(me);
++  const MVert *verts = BKE_mesh_vertices(me);
 +  const MLoop *loops = BKE_mesh_loops(me);
  
-   BKE_mesh_calc_poly_normal(mp, loops + mp->loopstart, vertices, values);
 -  BKE_mesh_calc_poly_normal(mp, me->mloop + mp->loopstart, me->mvert, values);
++  BKE_mesh_calc_poly_normal(mp, loops + mp->loopstart, verts, values);
  }
  
  static bool rna_MeshPolygon_hide_get(PointerRNA *ptr)
@@@ -572,18 -566,16 +567,18 @@@ static void rna_MeshPolygon_center_get(
  {
    Mesh *me = rna_mesh(ptr);
    MPoly *mp = (MPoly *)ptr->data;
-   const MVert *vertices = BKE_mesh_vertices(me);
 -
 -  BKE_mesh_calc_poly_center(mp, me->mloop + mp->loopstart, me->mvert, values);
++  const MVert *verts = BKE_mesh_vertices(me);
 +  const MLoop *loops = BKE_mesh_loops(me);
-   BKE_mesh_calc_poly_center(mp, loops + mp->loopstart, vertices, values);
++  BKE_mesh_calc_poly_center(mp, loops + mp->loopstart, verts, values);
  }
  
  static float rna_MeshPolygon_area_get(PointerRNA *ptr)
  {
    Mesh *me = (Mesh *)ptr->owner_id;
    MPoly *mp = (MPoly *)ptr->data;
-   const MVert *vertices = BKE_mesh_vertices(me);
 -
 -  return BKE_mesh_calc_poly_area(mp, me->mloop + mp->loopstart, me->mvert);
++  const MVert *verts = BKE_mesh_vertices(me);
 +  const MLoop *loops = BKE_mesh_loops(me);
-   return BKE_mesh_calc_poly_area(mp, loops + mp->loopstart, vertices);
++  return BKE_mesh_calc_poly_area(mp, loops + mp->loopstart, verts);
  }
  
  static void rna_MeshPolygon_flip(ID *id, MPoly *mp)
@@@ -612,14 -601,11 +607,14 @@@ static void rna_MeshLoopTriangle_normal
  {
    Mesh *me = rna_mesh(ptr);
    MLoopTri *lt = (MLoopTri *)ptr->data;
-   const MVert *vertices = BKE_mesh_vertices(me);
 -  unsigned int v1 = me->mloop[lt->tri[0]].v;
 -  unsigned int v2 = me->mloop[lt->tri[1]].v;
 -  unsigned int v3 = me->mloop[lt->tri[2]].v;
++  const MVert *verts = BKE_mesh_vertices(me);
 +  const MLoop *loops = BKE_mesh_loops(me);
 +
 +  unsigned int v1 = loops[lt->tri[0]].v;
 +  unsigned int v2 = loops[lt->tri[1]].v;
 +  unsigned int v3 = loops[lt->tri[2]].v;
  
-   normal_tri_v3(values, vertices[v1].co, vertices[v2].co, vertices[v3].co);
 -  normal_tri_v3(values, me->mvert[v1].co, me->mvert[v2].co, me->mvert[v3].co);
++  normal_tri_v3(values, verts[v1].co, verts[v2].co, verts[v3].co);
  }
  
  static void rna_MeshLoopTriangle_split_normals_get(PointerRNA *ptr, float *values)
@@@ -644,14 -630,11 +639,14 @@@ static float rna_MeshLoopTriangle_area_
  {
    Mesh *me = rna_mesh(ptr);
    MLoopTri *lt = (MLoopTri *)ptr->data;
-   const MVert *vertices = BKE_mesh_vertices(me);
 -  unsigned int v1 = me->mloop[lt->tri[0]].v;
 -  unsigned int v2 = me->mloop[lt->tri[1]].v;
 -  unsigned int v3 = me->mloop[lt->tri[2]].v;
++  const MVert *verts = BKE_mesh_vertices(me);
 +  const MLoop *loops = BKE_mesh_loops(me);
  
 -  return area_tri_v3(me->mvert[v1].co, me->mvert[v2].co, me->mvert[v3].co);
 +  unsigned int v1 = loops[lt->tri[0]].v;
 +  unsigned int v2 = loops[lt->tri[1]].v;
 +  unsigned int v3 = loops[lt->tri[2]].v;
 +
-   return area_tri_v3(vertices[v1].co, vertices[v2].co, vertices[v3].co);
++  return area_tri_v3(verts[v1].co, verts[v2].co, verts[v3].co);
  }
  
  static void rna_MeshLoopColor_color_get(PointerRNA *ptr, float *values)
@@@ -701,11 -684,10 +696,10 @@@ static void rna_Mesh_texspace_loc_get(P
  static void rna_MeshVertex_groups_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)
  {
    Mesh *me = rna_mesh(ptr);
--
-   MDeformVert *dverts = BKE_mesh_deform_verts_for_write(me);
 -  if (me->dvert) {
++  MDeformVert *dverts = (MDeformVert *)BKE_mesh_deform_verts(me);
 +  if (dverts) {
      const int index = rna_MeshVertex_index_get(ptr);
 -    MDeformVert *dvert = &me->dvert[index];
 +    MDeformVert *dvert = &dverts[index];
  
      rna_iterator_array_begin(
          iter, (void *)dvert->dw, sizeof(MDeformWeight), dvert->totweight, 0, NULL);