[Bf-blender-cvs] [5f3ed620d2f] temp-sculpt-cavity-mask: temp-sculpt-cavity-mask: Remove cavity settings from Brush

[Joseph Eagar]

Commit: 5f3ed620d2fc204e05739240df63d607fb5c030e
Author: Joseph Eagar
Date:   Sat Jun 11 12:20:54 2022 -0700
Branches: temp-sculpt-cavity-mask
https://developer.blender.org/rB5f3ed620d2fc204e05739240df63d607fb5c030e

temp-sculpt-cavity-mask: Remove cavity settings from Brush

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

M	source/blender/blenkernel/BKE_paint.h
M	source/blender/blenkernel/intern/brush.c
M	source/blender/makesdna/DNA_brush_types.h
M	source/blender/makesrna/intern/rna_brush.c

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

diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 424f469f470..c7ac6385c83 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -49,6 +49,7 @@ struct Palette;
 struct PaletteColor;
 struct Scene;
 struct StrokeCache;
+struct Sculpt;
 struct SubdivCCG;
 struct Tex;
 struct ToolSettings;
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index 7389341d6e8..5e009a78fef 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -1698,9 +1698,7 @@ void BKE_brush_sculpt_reset(Brush *br)
   /* Note that sculpt defaults where set when 0.5 was the default (now it's 1.0)
    * assign this so logic below can remain the same. */
   br->alpha = 0.5f;
-
-  br->automasking_cavity_factor = 0.5f;
-
+  
   /* Brush settings */
   switch (br->sculpt_tool) {
     case SCULPT_TOOL_DRAW_SHARP:
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index 30991404e92..d13496b21f7 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -301,10 +301,6 @@ typedef struct Brush {
   /* automasking */
   int automasking_flags;
   int automasking_boundary_edges_propagation_steps;
-  struct CurveMapping *automasking_cavity_curve;
-  int automasking_cavity_blur_steps;
-
-  float automasking_cavity_factor;
 
   int elastic_deform_type;
   float elastic_deform_volume_preservation;
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index 9212814e9e1..80b7a1f895a 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -3141,26 +3141,6 @@ static void rna_def_brush(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "Custom Cavity Curve", "Use custom curve.");
   RNA_def_property_update(prop, 0, "rna_Brush_update");
 
-  prop = RNA_def_property(srna, "automasking_cavity_factor", PROP_FLOAT, PROP_NONE);
-  RNA_def_property_float_sdna(prop, NULL, "automasking_cavity_factor");
-  RNA_def_property_ui_text(prop, "Cavity Factor", "Cavity mask factor");
-  RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 3);
-  RNA_def_property_range(prop, 0.0f, 5.0f);
-  RNA_def_property_update(prop, 0, "rna_Brush_update");
-
-  prop = RNA_def_property(srna, "automasking_cavity_blur_steps", PROP_INT, PROP_NONE);
-  RNA_def_property_int_sdna(prop, NULL, "automasking_cavity_blur_steps");
-  RNA_def_property_ui_text(prop, "Blur Steps", "Cavity blur steps");
-  RNA_def_property_range(prop, 0.0f, 25.0f);
-  RNA_def_property_update(prop, 0, "rna_Brush_update");
-
-  prop = RNA_def_property(srna, "automasking_cavity_curve", PROP_POINTER, PROP_NONE);
-  RNA_def_property_pointer_sdna(prop, NULL, "automasking_cavity_curve");
-  RNA_def_property_struct_type(prop, "CurveMapping");
-  RNA_def_property_ui_text(prop, "Cavity Curve", "Curve used for the sensitivity");
-  RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-  RNA_def_property_update(prop, 0, "rna_Brush_update");
-
   prop = RNA_def_property(srna, "use_scene_spacing", PROP_ENUM, PROP_NONE);
   RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
   RNA_def_property_enum_items(prop, brush_spacing_unit_items);