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

[Pablo Dobarro]

Commit: bf53622eefe1f6a9dfcd0a934b312c313aaa71ca
Author: Pablo Dobarro
Date:   Fri Feb 12 17:57:50 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rBbf53622eefe1f6a9dfcd0a934b312c313aaa71ca

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/editors/sculpt_paint/paint_mask.c
index 0915a0ab0ee,26e2bcc42cf..3b726b52c97
--- a/source/blender/editors/sculpt_paint/paint_mask.c
+++ b/source/blender/editors/sculpt_paint/paint_mask.c
@@@ -1101,17 -1070,9 +1101,20 @@@ static void sculpt_gesture_trim_calcula
        /* When using normal orientation, if the stroke started over the mesh, position the mid point
         * at 0 distance from the shape plane. This positions the trimming shape half inside of the
         * surface. */
 +      if (SCULPT_GESTURE_TRIM_LOCATION_DEPTH_VOLUME) {
 +        mid_point_depth = ss->gesture_initial_hit ?
 +                              dist_signed_to_plane_v3(world_space_gesture_initial_location,
 +                                                      shape_plane) :
 +                              (trim_operation->depth_back + trim_operation->depth_front) * 0.5f;
 +      }
 +      else {
 +        mid_point_depth = ss->gesture_initial_hit ?
 +                              0.0f :
 +                              (trim_operation->depth_back + trim_operation->depth_front) * 0.5f;
 +      }
+       mid_point_depth = ss->gesture_initial_hit ?
+                             0.0f :
+                             (trim_operation->depth_back + trim_operation->depth_front) * 0.5f;
      }
  
      const float depth_radius = ss->cursor_radius;