[Bf-blender-cvs] [7dd8353faf6] temp-checkbox-layout-tweaks: Use checkbox+value for Sculpt Plane Trim & fix column headers

[William Reynish]

Commit: 7dd8353faf6f31acc249fcae708fa067659b1c68
Author: William Reynish
Date:   Sun Apr 12 10:08:19 2020 +0200
Branches: temp-checkbox-layout-tweaks
https://developer.blender.org/rB7dd8353faf6f31acc249fcae708fa067659b1c68

Use checkbox+value for Sculpt Plane Trim & fix column headers

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

M	release/scripts/startup/bl_ui/properties_paint_common.py

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

diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 9ea7ad96155..bcbaa44c188 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -587,10 +587,12 @@ def brush_settings(layout, context, brush, popover=False):
                 slider=True,
             )
 
-            layout.prop(brush, "use_plane_trim", text="Plane Trim")
-            row = layout.row()
-            row.active = brush.use_plane_trim
-            row.prop(brush, "plane_trim", slider=True, text="Distance")
+            row = layout.row(heading = "Plane Trim")
+            row.prop(brush, "use_plane_trim", text="")
+            sub = row.row()
+            sub.active = brush.use_plane_trim
+            sub.prop(brush, "plane_trim", slider=True, text="")
+
             layout.separator()
 
         # height
@@ -820,24 +822,24 @@ def brush_settings_advanced(layout, context, brush, popover=False):
         col = layout.column(heading = "Auto-Masking", align = True)
 
         # topology automasking
-        layout.prop(brush, "use_automasking_topology", text = "Topology")
+        col.prop(brush, "use_automasking_topology", text = "Topology")
 
         # face masks automasking
-        layout.prop(brush, "use_automasking_face_sets", text = "Face Sets")
+        col.prop(brush, "use_automasking_face_sets", text = "Face Sets")
         
         # boundary edges/face sets automasking
-        layout.prop(brush, "use_automasking_boundary_edges", text = "Mesh Boundary")
-        layout.prop(brush, "use_automasking_boundary_face_sets", text = "Face Sets")
-        layout.prop(brush, "automasking_boundary_edges_propagation_steps")
+        col.prop(brush, "use_automasking_boundary_edges", text = "Mesh Boundary")
+        col.prop(brush, "use_automasking_boundary_face_sets", text = "Face Sets")
+        col.prop(brush, "automasking_boundary_edges_propagation_steps")
 
         layout.separator()
 
         # sculpt plane settings
         if capabilities.has_sculpt_plane:
             layout.prop(brush, "sculpt_plane")
-            col = layout.column(heading = "Original", align = True)
-            layout.prop(brush, "use_original_normal", text ="Normal")
-            layout.prop(brush, "use_original_plane", text ="Plane")
+            col = layout.column(heading = "Use Original", align = True)
+            col.prop(brush, "use_original_normal", text ="Normal")
+            col.prop(brush, "use_original_plane", text ="Plane")
             layout.separator()
 
     # 3D and 2D Texture Paint.