[Bf-blender-cvs] [dd5dd1efdff] temp-pbvh-seam-texturing-tweaks: Merge branch 'master' into temp-pbvh-seam-texturing-tweaks

[Jeroen Bakker]

Commit: dd5dd1efdffe9539628a9d480b8091551f5d40d5
Author: Jeroen Bakker
Date:   Fri Jan 6 11:22:36 2023 +0100
Branches: temp-pbvh-seam-texturing-tweaks
https://developer.blender.org/rBdd5dd1efdffe9539628a9d480b8091551f5d40d5

Merge branch 'master' into temp-pbvh-seam-texturing-tweaks

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



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

diff --cc source/blender/blenkernel/intern/pbvh_uv_islands.cc
index 97ac97dddda,15397170525..3677d507116
--- a/source/blender/blenkernel/intern/pbvh_uv_islands.cc
+++ b/source/blender/blenkernel/intern/pbvh_uv_islands.cc
@@@ -1329,11 -1303,11 +1329,11 @@@ static void add_uv_island(const MeshDat
                            const UVIsland &uv_island,
                            int16_t island_index)
  {
-   for (const VectorList<UVPrimitive>::UsedVector &uv_primitives : uv_island.uv_primitives)
+   for (const VectorList<UVPrimitive>::UsedVector &uv_primitives : uv_island.uv_primitives) {
      for (const UVPrimitive &uv_primitive : uv_primitives) {
 -      const MeshPrimitive *mesh_primitive = uv_primitive.primitive;
 +      const MLoopTri &looptri = mesh_data.looptris[uv_primitive.primitive_i];
  
 -      rctf uv_bounds = mesh_primitive->uv_bounds();
 +      rctf uv_bounds = primitive_uv_bounds(looptri, mesh_data.uv_map);
        rcti buffer_bounds;
        buffer_bounds.xmin = max_ii(
            floor((uv_bounds.xmin - tile.udim_offset.x) * tile.mask_resolution.x), 0);
@@@ -1364,13 -1338,14 +1364,14 @@@
          }
        }
      }
+   }
  }
  
 -void UVIslandsMask::add(const UVIslands &uv_islands)
 +void UVIslandsMask::add(const MeshData &mesh_data, const UVIslands &uv_islands)
  {
    for (Tile &tile : tiles) {
 -    for (int index = 0; index < uv_islands.islands.size(); index++) {
 -      add_uv_island(tile, uv_islands.islands[index], index);
 +    for (const int i : uv_islands.islands.index_range()) {
 +      add_uv_island(mesh_data, tile, uv_islands.islands[i], i);
      }
    }
  }
diff --cc source/blender/blenkernel/intern/pbvh_uv_islands.hh
index f7f8ed190b2,7774c43609c..fe66c04691f
--- a/source/blender/blenkernel/intern/pbvh_uv_islands.hh
+++ b/source/blender/blenkernel/intern/pbvh_uv_islands.hh
@@@ -202,9 -166,9 +202,9 @@@ struct UVPrimitive 
     * Will assert when no UVEdge found.
     */
    UVEdge *get_uv_edge(const float2 uv1, const float2 uv2) const;
 -  UVEdge *get_uv_edge(const MeshVertex *v1, const MeshVertex *v2) const;
 +  UVEdge *get_uv_edge(const int v1, const int v2) const;
  
-   const bool contains_uv_vertex(const UVVertex *uv_vertex) const;
+   bool contains_uv_vertex(const UVVertex *uv_vertex) const;
    const UVVertex *get_other_uv_vertex(const UVVertex *v1, const UVVertex *v2) const;
  
    UVBorder extract_border() const;