[Bf-blender-cvs] [67e053b1fb2] temp-gpencil-automask: Fix merge error

[Antonio Vazquez]

Commit: 67e053b1fb2fd73f6bdc41bd51cd6d751a263de5
Author: Antonio Vazquez
Date:   Mon Oct 17 16:59:46 2022 +0200
Branches: temp-gpencil-automask
https://developer.blender.org/rB67e053b1fb2fd73f6bdc41bd51cd6d751a263de5

Fix merge error

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index ff7774529a1..d9abad1f790 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -837,20 +837,18 @@ class VIEW3D_HT_header(Header):
                         panel="VIEW3D_PT_gpencil_guide",
                         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"
                 )
+        elif object_mode == 'SCULPT':
+            layout.popover(
+                panel="VIEW3D_PT_sculpt_automasking",
+                text="",
+                icon="MOD_MASK"
+            )
         else:
             # Transform settings depending on tool header visibility
             VIEW3D_HT_header.draw_xform_template(layout, context)