Merge branch 'master' into temp-gpencil-drw-enginetemp-gpencil-drw-engine

1 files changed, 3 insertions, 10 deletions

diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h
index e9af49a0b5a..93e4a777569 100644
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@ -194,12 +194,9 @@ typedef struct SculptThreadedTaskData {
 
   int filter_type;
   float filter_strength;
-  int *node_mask;
 
-  /* 0=towards view, 1=flipped */
-  float (*area_cos)[3];
-  float (*area_nos)[3];
-  int *count;
+  bool use_area_cos;
+  bool use_area_nos;
   bool any_vertex_sampled;
 
   float *prev_mask;
@@ -209,13 +206,8 @@ typedef struct SculptThreadedTaskData {
   float *pose_factor;
   float (*transform_rot)[4], (*transform_trans)[4], (*transform_trans_inv)[4];
 
-  float tot_pos_avg[3];
-  int tot_pos_count;
-
   float max_distance_squared;
   float nearest_vertex_search_co[3];
-  int nearest_vertex_index;
-  float nearest_vertex_distance_squared;
 
   int mask_expand_update_it;
   bool mask_expand_invert_mask;
@@ -418,6 +410,7 @@ typedef struct FilterCache {
   int mask_update_last_it;
   int *mask_update_it;
   float *normal_factor;
+  float *edge_factor;
   float *prev_mask;
   float mask_expand_initial_co[3];
 } FilterCache;