diff options
author | Peter Klimenko <peterklimk@outlook.com> | 2020-07-31 11:45:15 +0300 |
---|---|---|
committer | Peter Klimenko <peterklimk@outlook.com> | 2020-07-31 11:45:15 +0300 |
commit | 97a4a8d0fb7fd9ac34f9f5d4d5a0689c01235e14 (patch) | |
tree | fc9746d2210eda08be9d44ae67d5e58d64b48b40 /release/scripts/startup/bl_ui/space_image.py | |
parent | 4a7c203e9ecc7c5b0370afc0fdd6bcc183dc00df (diff) | |
parent | f3e8326453ae856d7914e45e832a2ed80aa9a9b9 (diff) |
merge
Diffstat (limited to 'release/scripts/startup/bl_ui/space_image.py')
-rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 65 |
1 files changed, 55 insertions, 10 deletions
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 76b7fc7f156..75c1bb5e3f9 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -176,7 +176,7 @@ class IMAGE_MT_select(Menu): layout.separator() layout.operator("uv.select_pinned") - layout.operator("uv.select_linked") + layout.menu("IMAGE_MT_select_linked") layout.separator() @@ -184,6 +184,16 @@ class IMAGE_MT_select(Menu): layout.operator("uv.select_overlap") +class IMAGE_MT_select_linked(Menu): + bl_label = "Select Linked" + + def draw(self, _context): + layout = self.layout + + layout.operator("uv.select_linked", text="Linked") + layout.operator("uv.shortest_path_select", text="Shortest Path") + + class IMAGE_MT_image(Menu): bl_label = "Image" @@ -321,15 +331,37 @@ class IMAGE_MT_uvs_mirror(Menu): layout.operator("transform.mirror", text="Y Axis").constraint_axis[1] = True -class IMAGE_MT_uvs_weldalign(Menu): - bl_label = "Weld/Align" +class IMAGE_MT_uvs_align(Menu): + bl_label = "Align" + + def draw(self, _context): + layout = self.layout + + layout.operator_enum("uv.align", "axis") + + +class IMAGE_MT_uvs_merge(Menu): + bl_label = "Merge" def draw(self, _context): layout = self.layout - layout.operator("uv.weld") # W, 1. - layout.operator("uv.remove_doubles") - layout.operator_enum("uv.align", "axis") # W, 2/3/4. + layout.operator("uv.weld", text="At Center") + # Mainly to match the mesh menu. + layout.operator("uv.snap_selected", text="At Cursor").target = 'CURSOR' + + layout.separator() + + layout.operator("uv.remove_doubles", text="By Distance") + + +class IMAGE_MT_uvs_split(Menu): + bl_label = "Split" + + def draw(self, _context): + layout = self.layout + + layout.operator("uv.select_split", text="Selection") class IMAGE_MT_uvs(Menu): @@ -350,6 +382,11 @@ class IMAGE_MT_uvs(Menu): layout.separator() + layout.menu("IMAGE_MT_uvs_merge") + layout.menu("IMAGE_MT_uvs_split") + + layout.separator() + layout.prop(uv, "use_live_unwrap") layout.operator("uv.unwrap") @@ -373,7 +410,7 @@ class IMAGE_MT_uvs(Menu): layout.operator("uv.minimize_stretch") layout.operator("uv.stitch") - layout.menu("IMAGE_MT_uvs_weldalign") + layout.menu("IMAGE_MT_uvs_align") layout.separator() @@ -462,7 +499,7 @@ class IMAGE_MT_uvs_context_menu(Menu): layout.separator() # Remove - layout.operator("uv.remove_doubles", text="Remove Double UVs") + layout.operator("uv.remove_doubles", text="Merge By Distance") layout.operator("uv.stitch") layout.operator("uv.weld") @@ -662,7 +699,12 @@ class IMAGE_HT_header(Header): # Proportional Editing row = layout.row(align=True) - row.prop(tool_settings, "use_proportional_edit", icon_only=True) + row.prop( + tool_settings, + "use_proportional_edit", + icon_only=True, + icon='PROP_CON' if tool_settings.use_proportional_connected else 'PROP_ON', + ) sub = row.row(align=True) sub.active = tool_settings.use_proportional_edit sub.prop_with_popover( @@ -1452,6 +1494,7 @@ classes = ( IMAGE_MT_view, IMAGE_MT_view_zoom, IMAGE_MT_select, + IMAGE_MT_select_linked, IMAGE_MT_image, IMAGE_MT_image_invert, IMAGE_MT_uvs, @@ -1459,7 +1502,9 @@ classes = ( IMAGE_MT_uvs_transform, IMAGE_MT_uvs_snap, IMAGE_MT_uvs_mirror, - IMAGE_MT_uvs_weldalign, + IMAGE_MT_uvs_align, + IMAGE_MT_uvs_merge, + IMAGE_MT_uvs_split, IMAGE_MT_uvs_select_mode, IMAGE_MT_uvs_context_menu, IMAGE_MT_mask_context_menu, |