diff options
Diffstat (limited to 'release/scripts/startup/bl_ui')
4 files changed, 72 insertions, 22 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index f216acb2f0f..131a7b8dce1 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -494,13 +494,9 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): layout.prop(md, "iterations") - row = layout.row() - row.active = not is_bind - row.label(text="Anchors Vertex Group:") - - row = layout.row() + row = layout.row(align=True) row.enabled = not is_bind - row.prop_search(md, "vertex_group", ob, "vertex_groups", text="") + row.prop_search(md, "vertex_group", ob, "vertex_groups") row.prop(md, "invert_vertex_group", text="", icon='ARROW_LEFTRIGHT') layout.separator() diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py index d2deb70d4a2..796c089906d 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_common.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py @@ -68,8 +68,8 @@ ToolDef = namedtuple( "idname", # The name to display in the interface. "label", - # Description (for tooltip), when not set, use the description of 'operator', - # may be a string or a 'function(context, item, keymap) -> string'. + # Description (for tool-tip), when not set, use the description of 'operator', + # may be a string or a 'function(context, item, key-map) -> string'. "description", # The name of the icon to use (found in ``release/datafiles/icons``) or None for no icon. "icon", @@ -77,13 +77,34 @@ ToolDef = namedtuple( "cursor", # An optional gizmo group to activate when the tool is set or None for no gizmo. "widget", - # Optional keymap for tool, either: - # - A function that populates a keymaps passed in as an argument. + # Optional key-map for tool, possible values are: + # + # - ``None`` when the tool doesn't have a key-map. + # Also the default value when no key-map value is defined. + # + # - A string literal for the key-map name, the key-map items are located in the default key-map. + # + # - ``()`` an empty tuple for a default name. + # This is convenience functionality for generating a key-map name. + # So if a tool name is "Bone Size", in "Edit Armature" mode for the "3D View", + # All of these values are combined into an id, e.g: + # "3D View Tool: Edit Armature, Bone Envelope" + # + # Typically searching for a string ending with the tool name + # in the default key-map will lead you to the key-map for a tool. + # + # - A function that populates a key-maps passed in as an argument. + # # - A tuple filled with triple's of: # ``(operator_id, operator_properties, keymap_item_args)``. # + # Use this to define the key-map in-line. + # + # Note that this isn't used for Blender's built in tools which use the built-in key-map. + # Keep this functionality since it's likely useful for add-on key-maps. + # # Warning: currently 'from_dict' this is a list of one item, - # so internally we can swap the keymap function for the keymap it's self. + # so internally we can swap the key-map function for the key-map it's self. # This isn't very nice and may change, tool definitions shouldn't care about this. "keymap", # Optional data-block associated with this tool. diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index cd1fc49ac8b..2c79ceb5763 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -18,6 +18,9 @@ # <pep8 compliant> +# For documentation on tool definitions: see "bl_ui.space_toolsystem_common.ToolDef" +# where there are comments for each field and their use. + # For now group all tools together # we may want to move these into per space-type files. # @@ -608,15 +611,6 @@ class _defs_edit_mesh: region_type = context.region.type if not extra: - if props.offset_type == 'PERCENT': - layout.prop(props, "offset_pct") - else: - offset_text = "Width" - if props.offset_type == 'DEPTH': - offset_text = "Depth" - elif props.offset_type == 'OFFSET': - offset_text = "Offset" - layout.prop(props, "offset", text=offset_text) if region_type == 'TOOL_HEADER': layout.prop(props, "offset_type", text="") else: @@ -1136,8 +1130,25 @@ class _defs_weight_paint: def draw_settings(context, layout, tool): brush = context.tool_settings.weight_paint.brush if brush is not None: - layout.prop(brush, "weight", slider=True) - layout.prop(brush, "strength", slider=True) + from bl_ui.properties_paint_common import UnifiedPaintPanel + UnifiedPaintPanel.prop_unified( + layout, + context, + brush, + "weight", + unified_name="use_unified_weight", + slider=True, + header=True + ) + UnifiedPaintPanel.prop_unified( + layout, + context, + brush, + "strength", + unified_name="use_unified_strength", + header=True + ) + props = tool.operator_properties("paint.weight_gradient") layout.prop(props, "type", expand=True) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 7d880f4892f..3d0a5acc0a7 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -4294,6 +4294,7 @@ class VIEW3D_MT_edit_curve_context_menu(Menu): # Remove layout.operator("curve.split") layout.operator("curve.decimate") + layout.operator("curve.separate") layout.operator("curve.dissolve_verts") layout.operator("curve.delete", text="Delete Segment").type = 'SEGMENT' layout.operator("curve.delete", text="Delete Point").type = 'VERT' @@ -4333,6 +4334,23 @@ class VIEW3D_MT_edit_font(Menu): layout.operator("font.style_toggle", text="Toggle Underline", icon='UNDERLINE').style = 'UNDERLINE' layout.operator("font.style_toggle", text="Toggle Small Caps", icon='SMALL_CAPS').style = 'SMALL_CAPS' + layout.menu("VIEW3D_MT_edit_font_kerning") + + +class VIEW3D_MT_edit_font_kerning(Menu): + bl_label = "Kerning" + + def draw(self, context): + layout = self.layout + + ob = context.active_object + text = ob.data + kerning = text.edit_format.kerning + + layout.operator("font.change_spacing", text="Decrease Kerning").delta = -1 + layout.operator("font.change_spacing", text="Increase Kerning").delta = 1 + layout.operator("font.change_spacing", text="Reset Kerning").delta = -kerning + class VIEW3D_MT_edit_text_chars(Menu): bl_label = "Special Characters" @@ -4524,6 +4542,7 @@ class VIEW3D_MT_armature_context_menu(Menu): # Remove layout.operator("armature.split") + layout.operator("armature.separate") layout.operator("armature.merge") layout.operator("armature.dissolve") layout.operator("armature.delete") @@ -5419,6 +5438,7 @@ class VIEW3D_PT_shading_lighting(Panel): col.prop(shading, "studiolight_rotate_z", text="Rotation") col.prop(shading, "studiolight_intensity") col.prop(shading, "studiolight_background_alpha") + col.prop(shading, "studiolight_background_blur") col = split.column() # to align properly with above elif shading.type == 'RENDERED': @@ -5442,6 +5462,7 @@ class VIEW3D_PT_shading_lighting(Panel): col.prop(shading, "studiolight_rotate_z", text="Rotation") col.prop(shading, "studiolight_intensity") col.prop(shading, "studiolight_background_alpha") + col.prop(shading, "studiolight_background_blur") col = split.column() # to align properly with above @@ -7107,6 +7128,7 @@ classes = ( VIEW3D_MT_edit_curve_showhide, VIEW3D_MT_edit_surface, VIEW3D_MT_edit_font, + VIEW3D_MT_edit_font_kerning, VIEW3D_MT_edit_text_chars, VIEW3D_MT_edit_meta, VIEW3D_MT_edit_meta_showhide, |