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

[Hans Goudey]

Commit: f4163d07241215a5ec24c64a498065c664862910
Author: Hans Goudey
Date:   Tue Jan 10 23:03:28 2023 -0500
Branches: temp-pbvh-seam-texturing-tweaks
https://developer.blender.org/rBf4163d07241215a5ec24c64a498065c664862910

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

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



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

diff --cc source/blender/blenkernel/intern/pbvh_pixels.cc
index a53d8e63753,884da8b89f0..39651349ae9
--- a/source/blender/blenkernel/intern/pbvh_pixels.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels.cc
@@@ -357,8 -355,9 +357,8 @@@ static void update_pixels(PBVH *pbvh, M
      return;
    }
  
-   const StringRef active_uv_name = CustomData_get_active_layer_name(&mesh->ldata, CD_MLOOPUV);
 -  const float2 *ldata_uv = static_cast<const float2 *>(
 -      CustomData_get_layer(&mesh->ldata, CD_PROP_FLOAT2));
 -  if (ldata_uv == nullptr) {
++  const StringRef active_uv_name = CustomData_get_active_layer_name(&mesh->ldata, CD_PROP_FLOAT2);
 +  if (active_uv_name.is_empty()) {
      return;
    }
  
diff --cc source/blender/blenkernel/intern/pbvh_uv_islands.hh
index fe66c04691f,db1b12cdcb3..b97d07a2146
--- a/source/blender/blenkernel/intern/pbvh_uv_islands.hh
+++ b/source/blender/blenkernel/intern/pbvh_uv_islands.hh
@@@ -140,10 -104,10 +140,10 @@@ struct MeshData 
    int64_t uv_island_len;
  
   public:
 -  explicit MeshData(const Span<MLoopTri> looptris,
 -                    const Span<MLoop> loops,
 +  explicit MeshData(Span<MLoopTri> looptris,
 +                    Span<MLoop> loops,
                      const int verts_num,
-                     Span<float2> uv_map);
 -                    const Span<float2> mloopuv);
++                    const Span<float2> uv_map);
  };
  
  struct UVVertex {