[Bf-blender-cvs] [f3f77d21751] temp-T96710-pbvh-pixels: Merge branch 'master' into temp-T96710-pbvh-pixels

[Jeroen Bakker]

Commit: f3f77d217518468b4298782974980bfd1488a588
Author: Jeroen Bakker
Date:   Wed Apr 6 12:24:44 2022 +0200
Branches: temp-T96710-pbvh-pixels
https://developer.blender.org/rBf3f77d217518468b4298782974980bfd1488a588

Merge branch 'master' into temp-T96710-pbvh-pixels

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



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

diff --cc source/blender/blenkernel/BKE_pbvh.h
index 14ab7f84214,775847f27f8..2a5e3d83794
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@@ -35,8 -35,7 +36,9 @@@ struct PBVH
  struct PBVHNode;
  struct SubdivCCG;
  struct TaskParallelSettings;
 +struct Image;
 +struct ImageUser;
+ struct MeshElemMap;
  
  typedef struct PBVH PBVH;
  typedef struct PBVHNode PBVHNode;
diff --cc source/blender/blenkernel/CMakeLists.txt
index afcdd239082,61131cff06d..7c6693b48d8
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -240,9 -239,9 +239,10 @@@ set(SR
    intern/particle_child.c
    intern/particle_distribute.c
    intern/particle_system.c
+   intern/pbvh.cc
    intern/pbvh.c
    intern/pbvh_bmesh.c
 +  intern/pbvh_pixels.cc
    intern/pointcache.c
    intern/pointcloud.cc
    intern/preferences.c
diff --cc source/blender/editors/sculpt_paint/sculpt.c
index 55e9494e1c1,e03f12025c8..e306ae962d5
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@@ -4640,10 -4605,10 +4654,11 @@@ static bool sculpt_needs_connectivity_i
            (brush->sculpt_tool == SCULPT_TOOL_POSE) ||
            (brush->sculpt_tool == SCULPT_TOOL_BOUNDARY) ||
            (brush->sculpt_tool == SCULPT_TOOL_SLIDE_RELAX) ||
+           SCULPT_TOOL_NEEDS_COLOR(brush->sculpt_tool) ||
            (brush->sculpt_tool == SCULPT_TOOL_CLOTH) || (brush->sculpt_tool == SCULPT_TOOL_SMEAR) ||
            (brush->sculpt_tool == SCULPT_TOOL_DRAW_FACE_SETS) ||
 -          (brush->sculpt_tool == SCULPT_TOOL_DISPLACEMENT_SMEAR));
 +          (brush->sculpt_tool == SCULPT_TOOL_DISPLACEMENT_SMEAR) ||
 +          (brush->sculpt_tool == SCULPT_TOOL_PAINT));
  }
  
  void SCULPT_stroke_modifiers_check(const bContext *C, Object *ob, const Brush *brush)