temp-sculpt-cavity-mask: Make requested changes

3 files changed, 15 insertions, 36 deletions

diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject 3908254f0938a3c4c29189a455c8e356771e6ce
+Subproject 67f1fbca1482d9d9362a4001332e785c3fd5d23
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 2311532535c..6a09dc11aa5 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -5490,22 +5490,12 @@ class VIEW3D_MT_sculpt_automasking_pie(Menu):
         tool_settings = context.tool_settings
         sculpt = tool_settings.sculpt
 
-        def doprop(key, text):
-            if sculpt.brush and getattr(sculpt.brush, key):
-                pie.prop(sculpt, key, text=text + "(overridden by brush)")
-            else:
-                pie.prop(sculpt, key, text=text)
-
-        doprop("use_automasking_topology", "Topology")
-        doprop("use_automasking_topology", "Topology")
-        doprop("use_automasking_face_sets", "Face Sets")
-        doprop("use_automasking_boundary_edges", "Mesh Boundary")
-        doprop("use_automasking_boundary_face_sets", "Face Sets Boundary")
-
-        if sculpt.brush and (sculpt.brush.use_automasking_cavity or sculpt.brush.use_automasking_cavity_inverted):
-            pie.prop(sculpt, "use_automasking_cavity", text="Cavity (overridden by brush)")
-        else:
-            pie.prop(sculpt, "use_automasking_cavity", text="Cavity")
+        pie.prop(sculpt, "use_automasking_topology", text="Topology")
+        pie.prop(sculpt, "use_automasking_face_sets", text="Face Sets")
+        pie.prop(sculpt, "use_automasking_boundary_edges", text="Mesh Boundary")
+        pie.prop(sculpt, "use_automasking_boundary_face_sets", text="Face Sets Boundary")
+        pie.prop(sculpt, "use_automasking_cavity", text="Cavity")
+        pie.prop(sculpt, "use_automasking_cavity_inverted", text="Cavity (Inverted)")
 
 
 class VIEW3D_MT_sculpt_face_sets_edit_pie(Menu):
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 59dbbd80ef5..94cf23a03f3 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -967,33 +967,22 @@ class VIEW3D_PT_sculpt_options(Panel, View3DPaintPanel):
 
         col = layout.column(heading="Auto-Masking", align=True)
 
-        def doprop(key, text):
-            col2 = col.column()
-            col2.enabled = not sculpt.brush or not getattr(sculpt.brush, key)
-
-            if not col2.enabled:
-                text += " - overridden by brush"
-            col2.prop(sculpt, key, text=text)
-
-        doprop("use_automasking_topology", "Topology")
-        doprop("use_automasking_face_sets", "Face Sets")
-        doprop("use_automasking_boundary_edges", "Mesh Boundary")
-        doprop("use_automasking_boundary_face_sets", "Face Sets Boundary")
-        doprop("use_automasking_cavity", "Cavity")
-        doprop("use_automasking_cavity_inverted", "Cavity (Inverted)")
+        col.prop(sculpt, "use_automasking_topology", text="Topology")
+        col.prop(sculpt, "use_automasking_face_sets", text="Face Sets")
+        col.prop(sculpt, "use_automasking_boundary_edges", text="Mesh Boundary")
+        col.prop(sculpt, "use_automasking_boundary_face_sets", text="Face Sets Boundary")
+        col.prop(sculpt, "use_automasking_cavity", text="Cavity")
+        col.prop(sculpt, "use_automasking_cavity_inverted", text="Cavity (Inverted)")
 
         col.separator()
 
         if sculpt.use_automasking_cavity or sculpt.use_automasking_cavity_inverted:
-            props = col.operator("sculpt.mask_from_cavity", text="Mask From Cavity")
+            col2 = col.column()
+            props = col2.operator("sculpt.mask_from_cavity", text="Mask From Cavity")
             props.use_automask_settings = True
 
             col2 = col.column()
-            col2.enabled = not (sculpt.brush and sculpt.brush.use_automasking_cavity or sculpt.brush.use_automasking_cavity_inverted)
-
-            if not col2.enabled:
-                col2.label(text="Overridden by brush")
-
+            
             col2.prop(sculpt, "automasking_cavity_factor", text="Cavity Factor")
             col2.prop(sculpt, "automasking_cavity_blur_steps", text="Cavity Blur")