diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-31 18:16:27 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-31 18:16:27 +0400 |
| commit | c42d0189e586419269e9004868bec365e1b8396f (patch) | |
| tree | 896796da95b1f292ce36d61e4cf7224230b4f2e3 /release/scripts | |
| parent | 8f6197bd08955f210653973f313bd4de5026bd91 (diff) | |
resolve glitch in the image space where mask editing and UVs would conflict.
now UV editing overrides mask.
Diffstat (limited to 'release/scripts')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 3d9b3afc4ee..e86c18aeba2 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -380,6 +380,8 @@ class IMAGE_HT_header(Header): if not show_render: layout.prop(sima, "use_image_pin", text="") + layout.prop(sima, "mode", text="") + # uv editing if show_uvedit: uvedit = sima.uv_editor @@ -405,9 +407,7 @@ class IMAGE_HT_header(Header): mesh = context.edit_object.data layout.prop_search(mesh.uv_textures, "active", mesh, "uv_textures", text="") - layout.prop(sima, "mode", text="") - - if mode == 'MASK': + elif mode == 'MASK': row = layout.row() row.template_ID(sima, "mask", new="mask.new") |