[Bf-blender-cvs] [a72cf784a74] sculpt-dev: Merge branch 'master' into sculpt-dev

[Pablo Dobarro]

Commit: a72cf784a74e024e5bfd8ced5d6cf2eaf63bbda5
Author: Pablo Dobarro
Date:   Tue Jan 26 20:30:39 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rBa72cf784a74e024e5bfd8ced5d6cf2eaf63bbda5

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/editors/sculpt_paint/sculpt.c
index 51d94e6a533,4d6330e03f8..11ad030f3ae
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@@ -7733,10 -7235,10 +7733,11 @@@ static bool sculpt_needs_connectivity_i
            ((brush->sculpt_tool == SCULPT_TOOL_MASK) && (brush->mask_tool == BRUSH_MASK_SMOOTH)) ||
            (brush->sculpt_tool == SCULPT_TOOL_POSE) ||
            (brush->sculpt_tool == SCULPT_TOOL_BOUNDARY) ||
 +          (brush->sculpt_tool == SCULPT_TOOL_FAIRING) ||
            (brush->sculpt_tool == SCULPT_TOOL_SLIDE_RELAX) ||
            (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_DRAW_FACE_SETS) ||
+           (brush->sculpt_tool == SCULPT_TOOL_DISPLACEMENT_SMEAR));
  }
  
  void SCULPT_stroke_modifiers_check(const bContext *C, Object *ob, const Brush *brush)