diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-08-06 16:12:45 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-06 16:12:45 +0400 |
commit | 75a188272ed13d4c7d5a618e18d18c0828e617c1 (patch) | |
tree | 0c91bc1cdca7286fca43e3f4b1fe6f18d70b6e10 /release | |
parent | 4c4973350e4e9ed398081f155c15b1c8d960ce61 (diff) |
move pivot point and cursor out of UV rna into image space since both mask and uvedit use them.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index af39ce3437a..6585abe0bab 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -383,11 +383,17 @@ class IMAGE_HT_header(Header): layout.prop(sima, "mode", text="") + if show_maskedit: + row = layout.row() + row.template_ID(sima, "mask", new="mask.new") + + if show_uvedit or show_maskedit: + layout.prop(sima, "pivot_point", text="", icon_only=True) + # uv editing if show_uvedit: uvedit = sima.uv_editor - layout.prop(uvedit, "pivot_point", text="", icon_only=True) layout.prop(toolsettings, "use_uv_select_sync", text="") if toolsettings.use_uv_select_sync: @@ -408,14 +414,6 @@ class IMAGE_HT_header(Header): mesh = context.edit_object.data layout.prop_search(mesh.uv_textures, "active", mesh, "uv_textures", text="") - if show_maskedit: - row = layout.row() - row.template_ID(sima, "mask", new="mask.new") - - # reused for mask - uvedit = sima.uv_editor - layout.prop(uvedit, "pivot_point", text="", icon_only=True) - if ima: # layers layout.template_image_layers(ima, iuser) @@ -617,6 +615,7 @@ class IMAGE_PT_view_properties(Panel): sima = context.space_data ima = sima.image show_uvedit = sima.show_uvedit + show_maskedit = sima.show_maskedit uvedit = sima.uv_editor split = layout.split() @@ -635,12 +634,12 @@ class IMAGE_PT_view_properties(Panel): col.label(text="Coordinates:") col.prop(uvedit, "show_normalized_coords", text="Normalized") - if show_uvedit: - + if show_uvedit or show_maskedit: col = layout.column() col.label("Cursor Location:") - col.row().prop(uvedit, "cursor_location", text="") + col.row().prop(sima, "cursor_location", text="") + if show_uvedit: col.separator() col.label(text="UVs:") |