diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-09-05 16:13:10 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-09-05 16:13:10 +0300 |
commit | 61289c36291199525037e424cf84d5a65629bf58 (patch) | |
tree | 277829352085016c1778aebff6ac95b2555c3672 /release/scripts/startup/bl_ui | |
parent | 56a8977e92cf297c95782301c9ac44dd9767b531 (diff) | |
parent | c598e939ad25dfc3b4eb1c92b16de401bde0d88a (diff) |
Merge branch 'master' into greasepencil-edit-curve
Conflicts:
source/blender/blenkernel/BKE_gpencil_geom.h
Diffstat (limited to 'release/scripts/startup/bl_ui')
6 files changed, 71 insertions, 38 deletions
diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py index 3342fe1985a..6ee755722f3 100644 --- a/release/scripts/startup/bl_ui/properties_mask_common.py +++ b/release/scripts/startup/bl_ui/properties_mask_common.py @@ -324,27 +324,29 @@ class MASK_MT_mask(Menu): def draw(self, _context): layout = self.layout - layout.operator("mask.delete") + layout.menu("MASK_MT_transform") + layout.operator("mask.feather_weight_clear") layout.separator() layout.operator("mask.cyclic_toggle") - layout.operator("mask.switch_direction") - layout.operator("mask.normals_make_consistent") layout.operator("mask.handle_type_set") - layout.operator("mask.feather_weight_clear") # TODO, better place? + layout.operator("mask.normals_make_consistent") + layout.operator("mask.switch_direction") + + layout.separator() + layout.operator("mask.copy_splines") + layout.operator("mask.paste_splines") layout.separator() layout.operator("mask.parent_clear") layout.operator("mask.parent_set") layout.separator() - layout.operator("mask.copy_splines") - layout.operator("mask.paste_splines") + layout.menu("MASK_MT_animation") layout.separator() layout.menu("MASK_MT_visibility") - layout.menu("MASK_MT_transform") - layout.menu("MASK_MT_animation") + layout.operator("mask.delete") class MASK_MT_add(Menu): @@ -380,6 +382,13 @@ class MASK_MT_transform(Menu): layout.operator("transform.translate") layout.operator("transform.rotate") layout.operator("transform.resize") + + layout.separator() + layout.operator("transform.tosphere") + layout.operator("transform.shear") + layout.operator("transform.push_pull") + + layout.separator() layout.operator("transform.transform", text="Scale Feather").mode = 'MASK_SHRINKFATTEN' diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index 257ef420ef9..2c52d9cd337 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -44,7 +44,8 @@ class FILEBROWSER_HT_header(Header): class FILEBROWSER_PT_display(Panel): bl_space_type = 'FILE_BROWSER' bl_region_type = 'HEADER' - bl_label = "Display" + bl_label = "Display Settings" # Shows as tooltip in popover + bl_ui_units_x = 10 @classmethod def poll(cls, context): @@ -57,9 +58,6 @@ class FILEBROWSER_PT_display(Panel): space = context.space_data params = space.params - layout.label(text="Display as") - layout.column().prop(params, "display_type", expand=True) - layout.use_property_split = True layout.use_property_decorate = False # No animation. @@ -72,18 +70,15 @@ class FILEBROWSER_PT_display(Panel): layout.prop(params, "recursion_level", text="Recursions") - layout.use_property_split = False - layout.separator() - - layout.label(text="Sort by") - layout.column().prop(params, "sort_method", expand=True) + layout.column().prop(params, "sort_method", text="Sort By", expand=True) layout.prop(params, "use_sort_invert") class FILEBROWSER_PT_filter(Panel): bl_space_type = 'FILE_BROWSER' bl_region_type = 'HEADER' - bl_label = "Filter" + bl_label = "Filter Settings" # Shows as tooltip in popover + bl_ui_units_x = 8 @classmethod def poll(cls, context): @@ -97,8 +92,6 @@ class FILEBROWSER_PT_filter(Panel): params = space.params is_lib_browser = params.use_library_browsing - layout.prop(params, "use_filter", text="Filter", toggle=False) - col = layout.column() col.active = params.use_filter @@ -383,22 +376,13 @@ class FILEBROWSER_PT_directory_path(Panel): subsubrow.scale_x = 0.6 subsubrow.prop(params, "filter_search", text="", icon='VIEWZOOM') - # Uses prop_with_popover() as popover() only adds the triangle icon in headers. - subrow.prop_with_popover( - params, - "display_type", - panel="FILEBROWSER_PT_display", - text="", - icon_only=True, - ) - subrow.prop_with_popover( - params, - "display_type", - panel="FILEBROWSER_PT_filter", - text="", - icon='FILTER', - icon_only=True, - ) + subsubrow = subrow.row(align=True) + subsubrow.prop(params, "display_type", expand=True, icon_only=True) + subsubrow.popover("FILEBROWSER_PT_display", text="") + + subsubrow = subrow.row(align=True) + subsubrow.prop(params, "use_filter", toggle=True, icon='FILTER', icon_only=True) + subsubrow.popover("FILEBROWSER_PT_filter", text="") if space.active_operator: subrow.operator( diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 3aedc04af88..c63b0768957 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -499,9 +499,9 @@ class IMAGE_MT_uvs_context_menu(Menu): layout.separator() # Remove - layout.operator("uv.remove_doubles", text="Merge By Distance") + layout.menu("IMAGE_MT_uvs_merge") layout.operator("uv.stitch") - layout.operator("uv.weld") + layout.menu("IMAGE_MT_uvs_split") class IMAGE_MT_pivot_pie(Menu): diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index e336635a4ee..c17b981a6b8 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1255,6 +1255,37 @@ class _defs_sculpt: ) @ToolDef.from_fn + def face_set_box(): + def draw_settings(_context, layout, tool): + props = tool.operator_properties("sculpt.face_set_box_gesture") + layout.prop(props, "use_front_faces_only", expand=False) + + return dict( + idname="builtin.box_face_set", + label="Box Face Set", + icon="ops.sculpt.border_face_set", + widget=None, + keymap=(), + draw_settings=draw_settings, + ) + + @ToolDef.from_fn + def face_set_lasso(): + def draw_settings(_context, layout, tool): + props = tool.operator_properties("sculpt.face_set_lasso_gesture") + layout.prop(props, "use_front_faces_only", expand=False) + + return dict( + idname="builtin.lasso_face_set", + label="Lasso Face Set", + icon="ops.sculpt.lasso_face_set", + widget=None, + keymap=(), + draw_settings=draw_settings, + ) + + + @ToolDef.from_fn def mesh_filter(): def draw_settings(_context, layout, tool): props = tool.operator_properties("sculpt.mesh_filter") @@ -2596,6 +2627,10 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): _defs_sculpt.mask_border, _defs_sculpt.mask_lasso, ), + ( + _defs_sculpt.face_set_box, + _defs_sculpt.face_set_lasso, + ), _defs_sculpt.hide_border, None, _defs_sculpt.mesh_filter, diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index c31e689f0ae..b44f2624702 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3128,6 +3128,10 @@ class VIEW3D_MT_face_sets(Menu): layout.separator() + op = layout.operator("mesh.face_set_extract", text='Extract Face Set') + + layout.separator() + op = layout.operator("sculpt.face_set_change_visibility", text='Invert Visible Face Sets') op.mode = 'INVERT' diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index dfabf5e9d81..09744e44f35 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1702,6 +1702,7 @@ class VIEW3D_PT_tools_grease_pencil_interpolate(Panel): col = layout.column(align=True) col.label(text="Sequence Options:") + col.prop(settings, "step") col.prop(settings, "type") if settings.type == 'CUSTOM': # TODO: Options for loading/saving curve presets? |