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

[Hans Goudey]

Commit: e89b9ebd2db9cacd83701917eaf39bf1a9aabf8b
Author: Hans Goudey
Date:   Sun Jul 31 11:57:32 2022 -0500
Branches: refactor-mesh-remove-pointers
https://developer.blender.org/rBe89b9ebd2db9cacd83701917eaf39bf1a9aabf8b

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

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



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

diff --cc source/blender/modifiers/intern/MOD_solidify_extrude.c
index c9d3affe8a1,4b744cd8350..56a7f80e3fc
--- a/source/blender/modifiers/intern/MOD_solidify_extrude.c
+++ b/source/blender/modifiers/intern/MOD_solidify_extrude.c
@@@ -53,18 -53,35 +53,24 @@@ BLI_INLINE bool edgeref_is_init(const E
   * \param poly_nors: Precalculated face normals.
   * \param r_vert_nors: Return vert normals.
   */
- static void mesh_calc_hq_normal(Mesh *mesh, const float (*poly_nors)[3], float (*r_vert_nors)[3])
+ static void mesh_calc_hq_normal(Mesh *mesh,
+                                 const float (*poly_nors)[3],
+                                 float (*r_vert_nors)[3],
+ #ifdef USE_NONMANIFOLD_WORKAROUND
+                                 BLI_bitmap *edge_tmp_tag
+ #endif
+ )
  {
 -  int i, verts_num, edges_num, polys_num;
 -  MPoly *mpoly, *mp;
 -  MLoop *mloop, *ml;
 -  MEdge *medge, *ed;
 +  int i;
  
 -  verts_num = mesh->totvert;
 -  edges_num = mesh->totedge;
 -  polys_num = mesh->totpoly;
 -  mpoly = mesh->mpoly;
 -  medge = mesh->medge;
 -  mloop = mesh->mloop;
 +  const int verts_num = mesh->totvert;
 +  const int edges_num = mesh->totedge;
 +  const int polys_num = mesh->totpoly;
 +  const MPoly *mpoly = BKE_mesh_polygons(mesh);
 +  const MLoop *mloop = BKE_mesh_loops(mesh);
 +  const MEdge *medge = BKE_mesh_edges(mesh);
  
 -  /* we don't want to overwrite any referenced layers */
 -
 -  /* Doesn't work here! */
 -#if 0
 -  mv = CustomData_duplicate_referenced_layer(&dm->vertData, CD_MVERT, verts_num);
 -  cddm->mvert = mv;
 -#endif
 -
 -  mp = mpoly;
 +  const MPoly *mp = mpoly;
  
    {
      EdgeFaceRef *edge_ref_array = MEM_calloc_arrayN(