From ed8fca8782fac6775f981b2cc740274178fac75d Mon Sep 17 00:00:00 2001
From: William Reynish <billreynish>
Date: Thu, 28 Jun 2018 00:33:10 +0200
Subject: [PATCH] UI: Center ID Blocks in Image Editor

See T55635
---
 release/scripts/startup/bl_ui/space_image.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 1acc8cf601d..5c1886e5be9 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -480,6 +480,10 @@ class IMAGE_HT_header(Header):
 
         layout.prop(sima, "mode", text="")
 
+        MASK_MT_editor_menus.draw_collapsible(context, layout)
+
+        layout.separator_spacer()
+
         layout.template_ID(sima, "image", new="image.new", open="image.open")
         if not show_render:
             layout.prop(sima, "use_image_pin", text="")
@@ -488,6 +492,8 @@ class IMAGE_HT_header(Header):
             row = layout.row()
             row.template_ID(sima, "mask", new="mask.new")
 
+        layout.separator_spacer()
+
         # uv editing
         if show_uvedit:
             uvedit = sima.uv_editor
@@ -500,10 +506,7 @@ class IMAGE_HT_header(Header):
                 layout.prop(toolsettings, "uv_select_mode", text="", expand=True)
                 layout.prop(uvedit, "sticky_select_mode", icon_only=True)
 
-        MASK_MT_editor_menus.draw_collapsible(context, layout)
-
-        layout.separator_spacer()
-
+        
         if show_uvedit or show_maskedit or mode == 'PAINT':
             layout.prop(sima, "use_realtime_update", icon_only=True, icon='LOCKED')