[Bf-blender-cvs] [6f054620d66] temp-sculpt-cavity-mask: temp-sculpt-cavity-mask: Remove old dirty mask menu entry

[Joseph Eagar]

Commit: 6f054620d6687dfa4a45fab60b6c0db1c8d94c8e
Author: Joseph Eagar
Date:   Fri Aug 5 15:29:11 2022 -0700
Branches: temp-sculpt-cavity-mask
https://developer.blender.org/rB6f054620d6687dfa4a45fab60b6c0db1c8d94c8e

temp-sculpt-cavity-mask: Remove old dirty mask menu entry

The operator code remains for now.

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

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/editors/sculpt_paint/sculpt_ops.c

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index d5c7b7f70cb..807fb94d3ef 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3280,8 +3280,6 @@ class VIEW3D_MT_mask(Menu):
 
         layout.separator()
 
-        props = layout.operator("sculpt.dirty_mask", text='Dirty Mask')
-
         props = layout.operator("sculpt.bake_automask", text="Mask From Cavity")
 
         props.use_scene_settings = False
diff --git a/source/blender/editors/sculpt_paint/sculpt_ops.c b/source/blender/editors/sculpt_paint/sculpt_ops.c
index da8f70d1ad0..b156544b895 100644
--- a/source/blender/editors/sculpt_paint/sculpt_ops.c
+++ b/source/blender/editors/sculpt_paint/sculpt_ops.c
@@ -1144,7 +1144,7 @@ static void SCULPT_OT_bake_automask(wmOperatorType *ot)
   ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
   RNA_def_enum(ot->srna, "mix_mode", mix_modes, AUTOMASK_BAKE_MIX, "Mode", "Mix mode");
-  RNA_def_float(ot->srna, "factor", 1.0f, 0.0f, 4.0f, "Mix Factor", "", 0.0f, 1.0f);
+  RNA_def_float(ot->srna, "factor", 1.0f, 0.0f, 4.0f, "Mix Factor", "", 0.0f, 2.0f);
 
   RNA_def_boolean(ot->srna,
                   "use_scene_settings",
@@ -1154,12 +1154,6 @@ static void SCULPT_OT_bake_automask(wmOperatorType *ot)
 
   RNA_def_float(ot->srna, "cavity_factor", 0.5f, 0.0f, 5.0f, "Cavity Factor", "", 0.0f, 1.0f);
   RNA_def_int(ot->srna, "cavity_blur_steps", 2, 0, 25, "Cavity Blur", "", 0, 25);
-  RNA_def_boolean(
-      ot->srna,
-      "use_cavity_curve",
-      false,
-      "Use Cavity Curve",
-      "Use cavity curve (edit in the Options panel in\n sculpt mode with Cavity enabled)");
 
   const EnumPropertyItem *entry = RNA_automasking_flags;
   do {