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

[Pablo Dobarro]

Commit: 13bdc4a7e6115cdbccd4789aad991d12e9a05843
Author: Pablo Dobarro
Date:   Fri May 14 19:08:19 2021 +0200
Branches: sculpt-dev
https://developer.blender.org/rB13bdc4a7e6115cdbccd4789aad991d12e9a05843

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/editors/sculpt_paint/paint_cursor.c
index 587ce8e572d,3829aeebbeb..0834fb4486c
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@@ -1645,12 -1654,7 +1654,13 @@@ static void paint_cursor_draw_3d_view_b
          2);
    }
  
 +  /* Transform Pivot. */
 +  if (pcontext->paint && pcontext->paint->flags & PAINT_SCULPT_SHOW_PIVOT) {
 +    cursor_draw_point_screen_space(
 +        pcontext->pos, pcontext->region, pcontext->ss->pivot_pos, pcontext->vc.obact->obmat, 2);
 +  }
-   if (brush->sculpt_tool == SCULPT_TOOL_BOUNDARY) {
++
+   if (is_brush_tool && brush->sculpt_tool == SCULPT_TOOL_BOUNDARY) {
      paint_cursor_preview_boundary_data_update(pcontext, update_previews);
      paint_cursor_preview_boundary_data_pivot_draw(pcontext);
    }