[Bf-blender-cvs] [fd6d1493477] blender2.8: UI: Header consistency for UV/Image editor

[Pablo Vazquez]

Commit: fd6d14934777ad59da8e152020535957978a85f9
Author: Pablo Vazquez
Date:   Mon Jul 2 14:46:36 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBfd6d14934777ad59da8e152020535957978a85f9

UI: Header consistency for UV/Image editor

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 75ce36cb45e..28f5fab4a3c 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -501,8 +501,6 @@ class IMAGE_HT_header(Header):
         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="")
 
         if show_maskedit:
             row = layout.row()
@@ -511,7 +509,10 @@ class IMAGE_HT_header(Header):
         layout.separator_spacer()
 
         if show_uvedit or show_maskedit or mode == 'PAINT':
-            layout.prop(sima, "use_realtime_update", icon_only=True, icon='LOCKED')
+            layout.prop(sima, "use_realtime_update", icon_only=True, icon='FILE_REFRESH')
+
+        if not show_render:
+            layout.prop(sima, "use_image_pin", text="")
 
         if show_uvedit:
             uvedit = sima.uv_editor
@@ -519,6 +520,9 @@ 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)
+
+        if show_uvedit:
             row = layout.row(align=True)
             row.prop(toolsettings, "proportional_edit", icon_only=True)
             # if toolsettings.proportional_edit != 'DISABLED':
@@ -532,8 +536,6 @@ class IMAGE_HT_header(Header):
             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:
                 row = layout.row()