[Bf-blender-cvs] [3150277d0cb] temp-gpencil-automask: Merge branch 'master' into temp-gpencil-automask

[Antonio Vazquez]

Commit: 3150277d0cb5b466e910db49974e8b3bb26d0405
Author: Antonio Vazquez
Date:   Mon Oct 17 16:57:31 2022 +0200
Branches: temp-gpencil-automask
https://developer.blender.org/rB3150277d0cb5b466e910db49974e8b3bb26d0405

Merge branch 'master' into temp-gpencil-automask

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 9308a3e8082,ea257498e11..ff7774529a1
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -838,14 -838,13 +838,19 @@@ class VIEW3D_HT_header(Header)
                          text="Guides",
                      )
  
+         elif object_mode == 'SCULPT':
+             layout.popover(
+                 panel="VIEW3D_PT_sculpt_automasking",
+                 text="",
+                 icon="MOD_MASK"
+             )
+ 
 +            if object_mode == 'SCULPT_GPENCIL':
 +                layout.popover(
 +                       panel="VIEW3D_PT_gpencil_sculpt_automasking",
 +                       text="",
 +                       icon="MOD_MASK"
 +                )
- 
-             layout.separator_spacer()
          else:
              # Transform settings depending on tool header visibility
              VIEW3D_HT_header.draw_xform_template(layout, context)