[Bf-blender-cvs] [14fa20d7979] temp-pbvh-split: Merge branch 'master' into temp-pbvh-split

[Joseph Eagar]

Commit: 14fa20d7979a98827ce5eaf6bbb578f678130592
Author: Joseph Eagar
Date:   Thu Jan 12 19:33:03 2023 -0800
Branches: temp-pbvh-split
https://developer.blender.org/rB14fa20d7979a98827ce5eaf6bbb578f678130592

Merge branch 'master' into temp-pbvh-split

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



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

diff --cc release/datafiles/locale
index 4a581c54af9,4f6dbb69893..7084c4ecd97
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 4a581c54af9b92cb670d750951b9382160f10f3e
 -Subproject commit 4f6dbb69893bd6bdf73467effe77ae46c8e4ee37
++Subproject commit 7084c4ecd97d93459d9d23fd90f81589b09be5df
diff --cc release/scripts/addons
index 0b0052bd53a,bf49eeaa14c..a9d4443c244
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 0b0052bd53ad8249ed07dfb87705c338af698bde
 -Subproject commit bf49eeaa14c445d3c53068203fdf91bff568fe64
++Subproject commit a9d4443c244f89399ec4bcc427e05a07950528cc
diff --cc release/scripts/addons_contrib
index 96143b1a8b0,0f72f6c85c3..bdcfdd47ec3
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 96143b1a8b037ea3c81f065f557025db9fe1ace3
 -Subproject commit 0f72f6c85c3743a9072273acb6a8a34b1cf1064b
++Subproject commit bdcfdd47ec3451822b21d1cff2ea2db751093c9a
diff --cc source/blender/blenkernel/intern/pbvh_pixels.cc
index 8af7cdf3eb4,39651349ae9..99d2103461e
--- a/source/blender/blenkernel/intern/pbvh_pixels.cc
+++ b/source/blender/blenkernel/intern/pbvh_pixels.cc
@@@ -536,10 -233,7 +538,10 @@@ static void do_encode_pixels(void *__re
  
  static bool should_pixels_be_updated(PBVHNode *node)
  {
-   if ((node->flag & (PBVH_Leaf|PBVH_TexLeaf)) == 0) {
 -  if ((node->flag & PBVH_Leaf) == 0) {
++  if ((node->flag & (PBVH_Leaf | PBVH_TexLeaf)) == 0) {
 +    return false;
 +  }
 +  if (node->children_offset != 0) {
      return false;
    }
    if ((node->flag & PBVH_RebuildPixels) != 0) {
@@@ -660,19 -354,19 +662,19 @@@ static bool update_pixels(PBVH *pbvh, M
    Vector<PBVHNode *> nodes_to_update;
  
    if (!find_nodes_to_update(pbvh, nodes_to_update)) {
 -    return;
 +    return false;
    }
  
-   const MLoopUV *ldata_uv = static_cast<const MLoopUV *>(
-       CustomData_get_layer(&mesh->ldata, CD_MLOOPUV));
-   if (ldata_uv == nullptr) {
-     return false;
+   const StringRef active_uv_name = CustomData_get_active_layer_name(&mesh->ldata, CD_PROP_FLOAT2);
+   if (active_uv_name.is_empty()) {
+     return;
    }
  
-   uv_islands::MeshData mesh_data({pbvh->looptri, pbvh->totprim},
-                                  {pbvh->mloop, mesh->totloop},
-                                  pbvh->totvert,
-                                  {ldata_uv, mesh->totloop});
+   const AttributeAccessor attributes = mesh->attributes();
+   const VArraySpan<float2> uv_map = attributes.lookup<float2>(active_uv_name, ATTR_DOMAIN_CORNER);
+ 
+   uv_islands::MeshData mesh_data(
+       {pbvh->looptri, pbvh->totprim}, {pbvh->mloop, mesh->totloop}, pbvh->totvert, uv_map);
    uv_islands::UVIslands islands(mesh_data);
  
    uv_islands::UVIslandsMask uv_masks;
diff --cc source/blender/editors/sculpt_paint/sculpt_paint_image.cc
index b376ab2c480,75c84c48f77..ebe4bcd4916
--- a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc
@@@ -338,30 -328,14 +341,30 @@@ static void do_paint_pixels(void *__res
    PBVHData &pbvh_data = BKE_pbvh_pixels_data_get(*pbvh);
    NodeData &node_data = BKE_pbvh_pixels_node_data_get(*node);
    const int thread_id = BLI_task_parallel_thread_id(tls);
-   MVert *mvert = SCULPT_mesh_deformed_mverts_get(ss);
+   const float(*positions)[3] = SCULPT_mesh_deformed_positions_get(ss);
  
    std::vector<bool> brush_test = init_uv_primitives_brush_test(
-       ss, pbvh_data.geom_primitives, node_data.uv_primitives, mvert);
+       ss, pbvh_data.geom_primitives, node_data.uv_primitives, positions);
  
-   PaintingKernel<ImageBufferFloat4> kernel_float4(ss, brush, thread_id, mvert);
-   PaintingKernel<ImageBufferByte4> kernel_byte4(ss, brush, thread_id, mvert);
+   PaintingKernel<ImageBufferFloat4> kernel_float4(ss, brush, thread_id, positions);
+   PaintingKernel<ImageBufferByte4> kernel_byte4(ss, brush, thread_id, positions);
  
 +  float brush_color[4];
 +
 +#ifdef DEBUG_PIXEL_NODES
 +  uint hash = BLI_hash_int(POINTER_AS_UINT(node));
 +
 +  brush_color[0] = (float)(hash & 255) / 255.0f;
 +  brush_color[1] = (float)((hash >> 8) & 255) / 255.0f;
 +  brush_color[2] = (float)((hash >> 16) & 255) / 255.0f;
 +#else
 +  copy_v3_v3(brush_color,
 +             ss->cache->invert ? BKE_brush_secondary_color_get(ss->scene, brush) :
 +                                 BKE_brush_color_get(ss->scene, brush));
 +#endif
 +
 +  brush_color[3] = 1.0f;
 +
    AutomaskingNodeData automask_data;
    SCULPT_automasking_node_begin(ob, ss, ss->cache->automasking, &automask_data, data->nodes[n]);
  
diff --cc source/tools
index fdfa2fcb949,3582f5326d0..e1744b9bd82
--- a/source/tools
+++ b/source/tools
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit fdfa2fcb9495d87571f2dfe2ae9fa0e032536600
 -Subproject commit 3582f5326d08ca05c2a19056597e49ec5511d854
++Subproject commit e1744b9bd82527cf7e8af63362b61bd309b5711b