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

[Pablo Dobarro]

Commit: 407dd37573ed32bf4a120bc40a1d212ab071ad56
Author: Pablo Dobarro
Date:   Wed Mar 3 17:08:59 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rB407dd37573ed32bf4a120bc40a1d212ab071ad56

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/editors/sculpt_paint/sculpt_expand.c
index 5f0abd548fe,db6d33c2700..bd59bb781cc
--- a/source/blender/editors/sculpt_paint/sculpt_expand.c
+++ b/source/blender/editors/sculpt_paint/sculpt_expand.c
@@@ -1396,16 -1468,16 +1468,16 @@@ static int sculpt_expand_target_vertex_
  {
    SculptSession *ss = ob->sculpt;
    SculptCursorGeometryInfo sgi;
 -  if (SCULPT_cursor_geometry_info_update(C, &sgi, mouse, false)) {
 +  if (SCULPT_cursor_geometry_info_update(C, &sgi, mouse, false, false)) {
      return SCULPT_active_vertex_get(ss);
    }
-   else {
-     return SCULPT_EXPAND_VERTEX_NONE;
-   }
+   return SCULPT_EXPAND_VERTEX_NONE;
  }
  
- /* Moves the sculpt pivot to the average point of the boundary enabled vertices of the current
-  * expand state. Take symmetry and active components into account. */
+ /**
+  * Moves the sculpt pivot to the average point of the boundary enabled vertices of the current
+  * expand state. Take symmetry and active components into account.
+  */
  static void sculpt_expand_reposition_pivot(bContext *C, Object *ob, ExpandCache *expand_cache)
  {
    SculptSession *ss = ob->sculpt;