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

[Pablo Dobarro]

Commit: f2024f7d99154be7c4fa9dba5b3aa0c3546fc0d2
Author: Pablo Dobarro
Date:   Tue Mar 2 17:05:00 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rBf2024f7d99154be7c4fa9dba5b3aa0c3546fc0d2

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/editors/sculpt_paint/paint_cursor.c
index a1e3f2c9514,b44f2f66d92..9ff76a2c96d
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@@ -1636,12 -1636,6 +1636,11 @@@ 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) {
      paint_cursor_preview_boundary_data_update(pcontext, update_previews);
      paint_cursor_preview_boundary_data_pivot_draw(pcontext);
diff --cc source/blender/editors/sculpt_paint/sculpt.c
index 5b25b341f6f,631327ddfe8..134a1fa12df
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@@ -10536,10 -9789,6 +10536,9 @@@ void ED_operatortypes_sculpt(void
    WM_operatortype_append(SCULPT_OT_trim_box_gesture);
    WM_operatortype_append(SCULPT_OT_trim_lasso_gesture);
    WM_operatortype_append(SCULPT_OT_project_line_gesture);
 +  WM_operatortype_append(SCULPT_OT_project_lasso_gesture);
 +  WM_operatortype_append(SCULPT_OT_project_box_gesture);
 +
-   WM_operatortype_append(SCULPT_OT_expand);
  
    WM_operatortype_append(SCULPT_OT_sample_color);
    WM_operatortype_append(SCULPT_OT_loop_to_vertex_colors);
@@@ -10547,8 -9796,6 +10546,10 @@@
    WM_operatortype_append(SCULPT_OT_color_filter);
    WM_operatortype_append(SCULPT_OT_mask_by_color);
    WM_operatortype_append(SCULPT_OT_dyntopo_detail_size_edit);
 +  WM_operatortype_append(SCULPT_OT_mask_init);
 +  WM_operatortype_append(SCULPT_OT_face_sets_init);
 +  WM_operatortype_append(SCULPT_OT_reset_brushes);
 +  WM_operatortype_append(SCULPT_OT_ipmask_filter);
+ 
+   WM_operatortype_append(SCULPT_OT_expand);
  }
diff --cc source/blender/editors/sculpt_paint/sculpt_intern.h
index 4b2dfde22eb,19c4eda7593..a44179b9841
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@@ -1298,15 -1233,6 +1273,55 @@@ typedef struct ExpandCache 
    float (*original_colors)[4];
  } ExpandCache;
  
++typedef enum eSculptGradientType {
++  SCULPT_GRADIENT_LINEAR,
++  SCULPT_GRADIENT_SPHERICAL,
++  SCULPT_GRADIENT_RADIAL,
++  SCULPT_GRADIENT_ANGLE,
++  SCULPT_GRADIENT_REFLECTED,
++} eSculptGradientType;
++typedef struct SculptGradientContext {
++
++  eSculptGradientType gradient_type;
++  ViewContext vc;
++
++  int symm;
++
++  int update_type;
++  float line_points[2][2];
++
++  float line_length;
++
++  float depth_point[3];
++
++  float gradient_plane[4];
++  float initial_location[3];
++
++  float gradient_line[3];
++  float initial_projected_location[2];
++
++  float strength;
++  void (*sculpt_gradient_begin)(struct bContext *);
++
++  void (*sculpt_gradient_apply_for_element)(struct Sculpt *,
++                                            struct SculptSession *,
++                                            SculptOrigVertData *orig_data,
++                                            PBVHVertexIter *vd,
++                                            float gradient_value,
++                                            float fade_value);
++  void (*sculpt_gradient_node_update)(struct PBVHNode *);
++  void (*sculpt_gradient_end)(struct bContext *);
++} SculptGradientContext;
++
 +/* IPMask filter vertex callback function. */
 +typedef float(SculptIPMaskFilterStepVertexCB)(struct SculptSession *, int, float *);
 +
 +typedef struct MaskFilterDeltaStep {
 +  int totelem;
 +  int *index;
 +  float *delta;
 +} MaskFilterDeltaStep;
 +
  typedef struct FilterCache {
    bool enabled_axis[3];
    bool enabled_force_axis[3];