[Bf-blender-cvs] [a51b9895e1e] temp-T101739-fix-seam-bleeding-non-manifold: Merge branch 'master' into temp-T101739-fix-seam-bleeding-non-manifold

[Jeroen Bakker]

Commit: a51b9895e1e503e3d6daa2072602acd961168680
Author: Jeroen Bakker
Date:   Tue Jan 24 15:23:31 2023 +0100
Branches: temp-T101739-fix-seam-bleeding-non-manifold
https://developer.blender.org/rBa51b9895e1e503e3d6daa2072602acd961168680

Merge branch 'master' into temp-T101739-fix-seam-bleeding-non-manifold

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



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

diff --cc release/scripts/addons
index e6e204ef0ed,c0a678d3686..329f0560299
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit e6e204ef0ed78a8381f446e7d0204b84b4d50e16
 -Subproject commit c0a678d3686a591eb3041cc72b60aec2857d389a
++Subproject commit 329f0560299ab51b3de97d3f71173373d07426c1
diff --cc source/blender/blenkernel/CMakeLists.txt
index 5297aa360f1,7052f362fc4..a370ed20b96
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -249,10 -249,9 +249,10 @@@ set(SR
    intern/particle_distribute.c
    intern/particle_system.c
    intern/pbvh.c
-   intern/pbvh.cc
+   intern/pbvh_colors.cc
    intern/pbvh_bmesh.c
    intern/pbvh_pixels.cc
 +  intern/pbvh_pixels_copy.cc
    intern/pbvh_uv_islands.cc
    intern/pointcache.c
    intern/pointcloud.cc
diff --cc source/blender/editors/sculpt_paint/sculpt_paint_image.cc
index 94563cd2c50,d9e982f4ff8..7c6707b928a
--- a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc
@@@ -569,13 -567,13 +601,14 @@@ void SCULPT_do_paint_brush_image(PaintM
    }
  
    TaskParallelSettings settings;
-   BKE_pbvh_parallel_range_settings(&settings, true, totnode);
-   BLI_task_parallel_range(0, totnode, &data, do_push_undo_tile, &settings);
-   BLI_task_parallel_range(0, totnode, &data, do_paint_pixels, &settings);
-   fix_non_manifold_seam_bleeding(*ob, totnode, data);
+   BKE_pbvh_parallel_range_settings(&settings, true, texnodes_num);
+   BLI_task_parallel_range(0, texnodes_num, &data, do_push_undo_tile, &settings);
+   BLI_task_parallel_range(0, texnodes_num, &data, do_paint_pixels, &settings);
++  fix_non_manifold_seam_bleeding(*ob, texnodes_num, data);
  
    TaskParallelSettings settings_flush;
-   BKE_pbvh_parallel_range_settings(&settings_flush, false, totnode);
-   BLI_task_parallel_range(0, totnode, &data, do_mark_dirty_regions, &settings_flush);
+ 
+   BKE_pbvh_parallel_range_settings(&settings_flush, false, texnodes_num);
+   BLI_task_parallel_range(0, texnodes_num, &data, do_mark_dirty_regions, &settings_flush);
  }
  }