UI: Header consistency

Snap before proportional editing, pivot after

release/scripts/startup/bl_ui/space_dopesheet.py

@@ -262,10 +262,6 @@ class DOPESHEET_HT_editor_buttons(Header):
             row = layout.row(align=True)
             row.prop(st.dopesheet, "filter_text", text="")
 
-        # Grease Pencil mode doesn't need snapping, as it's frame-aligned only
-        if st.mode != 'GPENCIL':
-            layout.prop(st, "auto_snap", text="")
-
         layout.popover(
             space_type='DOPESHEET_EDITOR',
             region_type='HEADER',
@@ -274,6 +270,10 @@ class DOPESHEET_HT_editor_buttons(Header):
             icon='FILTER',
         )
 
+        # Grease Pencil mode doesn't need snapping, as it's frame-aligned only
+        if st.mode != 'GPENCIL':
+            layout.prop(st, "auto_snap", text="")
+
         row = layout.row(align=True)
         row.prop(toolsettings, "use_proportional_action", text="", icon_only=True)
         sub = row.row(align=True)

release/scripts/startup/bl_ui/space_graph.py

@@ -59,8 +59,6 @@ class GRAPH_HT_header(Header):
         else:
             row.operator("graph.ghost_curves_create", text="", icon='GHOST_ENABLED')
 
-        layout.prop(st, "auto_snap", text="")
-
         layout.popover(
             space_type='GRAPH_EDITOR',
             region_type='HEADER',
@@ -69,6 +67,8 @@ class GRAPH_HT_header(Header):
             icon='FILTER',
         )
 
+        layout.prop(st, "auto_snap", text="")
+
         row = layout.row(align=True)
         row.prop(toolsettings, "use_proportional_fcurve", text="", icon_only=True)
         sub = row.row(align=True)

release/scripts/startup/bl_ui/space_image.py

@@ -520,9 +520,13 @@ class IMAGE_HT_header(Header):
             mesh = context.edit_object.data
             layout.prop_search(mesh.uv_layers, "active", mesh, "uv_layers", text="")
 
-        layout.prop(sima, "pivot_point", icon_only=True)
+            # Snap
+            row = layout.row(align=True)
+            row.prop(toolsettings, "use_snap", text="")
+            row.prop(toolsettings, "snap_uv_element", icon_only=True)
+            if toolsettings.snap_uv_element != 'INCREMENT':
+                row.prop(toolsettings, "snap_target", text="")
 
-        if show_uvedit:
             row = layout.row(align=True)
             row.prop(toolsettings, "proportional_edit", icon_only=True)
             # if toolsettings.proportional_edit != 'DISABLED':
@@ -530,11 +534,7 @@ class IMAGE_HT_header(Header):
             sub.active = toolsettings.proportional_edit != 'DISABLED'
             sub.prop(toolsettings, "proportional_edit_falloff", icon_only=True)
 
-            row = layout.row(align=True)
-            row.prop(toolsettings, "use_snap", text="")
-            row.prop(toolsettings, "snap_uv_element", icon_only=True)
-            if toolsettings.snap_uv_element != 'INCREMENT':
-                row.prop(toolsettings, "snap_target", text="")
+        layout.prop(sima, "pivot_point", icon_only=True)
 
         if ima:
             if ima.is_stereo_3d:

release/scripts/startup/bl_ui/space_nla.py

@@ -43,8 +43,6 @@ class NLA_HT_header(Header):
 
         dopesheet_filter(layout, context)
 
-        layout.prop(st, "auto_snap", text="")
-
         layout.popover(
             space_type='NLA_EDITOR',
             region_type='HEADER',
@@ -53,6 +51,8 @@ class NLA_HT_header(Header):
             icon='FILTER',
         )
 
+        layout.prop(st, "auto_snap", text="")
+
 
 class NLA_PT_filters(DopesheetFilterPopoverBase, Panel):
     bl_space_type = 'NLA_EDITOR'

release/scripts/startup/bl_ui/space_view3d.py

@@ -117,53 +117,10 @@ class VIEW3D_HT_header(Header):
         # Mode & Transform Settings
         scene = context.scene
 
-        # Orientation & Pivot
+        # Orientation
         if object_mode in {'OBJECT', 'EDIT', 'POSE'}:
             layout.prop(scene, "transform_orientation", text="")
 
-            pivot_point = tool_settings.transform_pivot_point
-            act_pivot_point = bpy.types.ToolSettings.bl_rna.properties["transform_pivot_point"].enum_items[pivot_point]
-            row = layout.row(align=True)
-            row.popover(
-                space_type='TOPBAR',
-                region_type='HEADER',
-                panel_type="TOPBAR_PT_pivot_point",
-                icon=act_pivot_point.icon,
-                text="",
-            )
-
-        if obj:
-            # Proportional editing
-            if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
-                row = layout.row(align=True)
-                row.prop(tool_settings, "proportional_edit", icon_only=True)
-
-                sub = row.row(align=True)
-                sub.active = tool_settings.proportional_edit != 'DISABLED'
-                sub.prop(tool_settings, "proportional_edit_falloff", icon_only=True)
-
-            elif object_mode in {'EDIT', 'PARTICLE_EDIT'}:
-                row = layout.row(align=True)
-                row.prop(tool_settings, "proportional_edit", icon_only=True)
-                sub = row.row(align=True)
-                sub.active = tool_settings.proportional_edit != 'DISABLED'
-                sub.prop(tool_settings, "proportional_edit_falloff", icon_only=True)
-
-            elif object_mode == 'OBJECT':
-                row = layout.row(align=True)
-                row.prop(tool_settings, "use_proportional_edit_objects", icon_only=True)
-                sub = row.row(align=True)
-                sub.active = tool_settings.use_proportional_edit_objects
-                sub.prop(tool_settings, "proportional_edit_falloff", icon_only=True)
-        else:
-            # Proportional editing
-            if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
-                row = layout.row(align=True)
-                row.prop(tool_settings, "proportional_edit", icon_only=True)
-                sub = row.row(align=True)
-                sub.active = tool_settings.proportional_edit != 'DISABLED'
-                sub.prop(tool_settings, "proportional_edit_falloff", icon_only=True)
-
         # Snap
         show_snap = False
         if obj is None:
@@ -203,6 +160,50 @@ class VIEW3D_HT_header(Header):
                 text=""
             )
 
+        # Proportional editing
+        if obj:
+            if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
+                row = layout.row(align=True)
+                row.prop(tool_settings, "proportional_edit", icon_only=True)
+
+                sub = row.row(align=True)
+                sub.active = tool_settings.proportional_edit != 'DISABLED'
+                sub.prop(tool_settings, "proportional_edit_falloff", icon_only=True)
+
+            elif object_mode in {'EDIT', 'PARTICLE_EDIT'}:
+                row = layout.row(align=True)
+                row.prop(tool_settings, "proportional_edit", icon_only=True)
+                sub = row.row(align=True)
+                sub.active = tool_settings.proportional_edit != 'DISABLED'
+                sub.prop(tool_settings, "proportional_edit_falloff", icon_only=True)
+
+            elif object_mode == 'OBJECT':
+                row = layout.row(align=True)
+                row.prop(tool_settings, "use_proportional_edit_objects", icon_only=True)
+                sub = row.row(align=True)
+                sub.active = tool_settings.use_proportional_edit_objects
+                sub.prop(tool_settings, "proportional_edit_falloff", icon_only=True)
+        else:
+            if context.gpencil_data and context.gpencil_data.use_stroke_edit_mode:
+                row = layout.row(align=True)
+                row.prop(tool_settings, "proportional_edit", icon_only=True)
+                sub = row.row(align=True)
+                sub.active = tool_settings.proportional_edit != 'DISABLED'
+                sub.prop(tool_settings, "proportional_edit_falloff", icon_only=True)
+
+        # Orientation & Pivot
+        if object_mode in {'OBJECT', 'EDIT', 'POSE'}:
+            pivot_point = tool_settings.transform_pivot_point
+            act_pivot_point = bpy.types.ToolSettings.bl_rna.properties["transform_pivot_point"].enum_items[pivot_point]
+            row = layout.row(align=True)
+            row.popover(
+                space_type='TOPBAR',
+                region_type='HEADER',
+                panel_type="TOPBAR_PT_pivot_point",
+                icon=act_pivot_point.icon,
+                text="",
+            )
+
 
 class VIEW3D_MT_editor_menus(Menu):
     bl_space_type = 'VIEW3D_MT_editor_menus'