[Bf-blender-cvs] [2ba38549f6a] refactor-mesh-uv-map-generic: Merge branch 'master' into refactor-mesh-uv-map-generic

[Martijn Versteegh]

Commit: 2ba38549f6aaf5adce9a727ebc1bc7742e1e52fa
Author: Martijn Versteegh
Date:   Tue Dec 13 00:01:38 2022 +0100
Branches: refactor-mesh-uv-map-generic
https://developer.blender.org/rB2ba38549f6aaf5adce9a727ebc1bc7742e1e52fa

Merge branch 'master' into refactor-mesh-uv-map-generic

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



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

diff --cc source/blender/blenkernel/intern/pbvh_uv_islands.cc
index 3ac4660fe15,21645e50e7e..c16ddfeaffb
--- a/source/blender/blenkernel/intern/pbvh_uv_islands.cc
+++ b/source/blender/blenkernel/intern/pbvh_uv_islands.cc
@@@ -115,8 -115,8 +115,8 @@@ static void mesh_data_init_primitives(M
      for (int j = 0; j < 3; j++) {
        MeshUVVert uv_vert;
        uv_vert.loop = tri.tri[j];
-       uv_vert.vertex = &mesh_data.vertices[mesh_data.mloop[uv_vert.loop].v];
+       uv_vert.vertex = &mesh_data.vertices[mesh_data.loops[uv_vert.loop].v];
 -      uv_vert.uv = mesh_data.mloopuv[uv_vert.loop].uv;
 +      uv_vert.uv = mesh_data.mloopuv[uv_vert.loop];
        primitive.vertices.append(uv_vert);
      }
      mesh_data.primitives.append(primitive);
@@@ -215,16 -215,11 +215,11 @@@ static void mesh_data_init(MeshData &me
    mesh_data_init_primitive_uv_island_ids(mesh_data);
  }
  
- MeshData::MeshData(const MLoopTri *looptri,
-                    const int64_t looptri_len,
-                    const int64_t vert_len,
-                    const MLoop *mloop,
-                    const float2 *mloopuv)
-     : looptri(looptri),
-       looptri_len(looptri_len),
-       vert_len(vert_len),
-       mloop(mloop),
-       mloopuv(mloopuv)
+ MeshData::MeshData(const Span<MLoopTri> looptris,
+                    const Span<MLoop> loops,
+                    const int verts_num,
 -                   const Span<MLoopUV> mloopuv)
++                   const Span<float2> mloopuv)
+     : looptris(looptris), verts_num(verts_num), loops(loops), mloopuv(mloopuv)
  {
    mesh_data_init(*this);
  }
diff --cc source/blender/blenkernel/intern/pbvh_uv_islands.hh
index eb6f05e356c,4d81f5da00c..98dc0342883
--- a/source/blender/blenkernel/intern/pbvh_uv_islands.hh
+++ b/source/blender/blenkernel/intern/pbvh_uv_islands.hh
@@@ -92,11 -92,10 +92,10 @@@ struct MeshPrimitive 
   */
  struct MeshData {
   public:
-   const MLoopTri *looptri;
-   const int64_t looptri_len;
-   const int64_t vert_len;
-   const MLoop *mloop;
-   const float2 *mloopuv;
+   const Span<MLoopTri> looptris;
+   const int64_t verts_num;
+   const Span<MLoop> loops;
 -  const Span<MLoopUV> mloopuv;
++  const Span<float2> mloopuv;
  
    Vector<MeshPrimitive> primitives;
    Vector<MeshEdge> edges;
@@@ -105,11 -104,10 +104,10 @@@
    int64_t uv_island_len;
  
   public:
-   explicit MeshData(const MLoopTri *looptri,
-                     const int64_t looptri_len,
-                     const int64_t vert_len,
-                     const MLoop *mloop,
-                     const float2 *mloopuv);
+   explicit MeshData(const Span<MLoopTri> looptris,
+                     const Span<MLoop> loops,
+                     const int verts_num,
 -                    const Span<MLoopUV> mloopuv);
++                    const Span<float2> mloopuv);
  };
  
  struct UVVertex {