diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-06-23 17:29:14 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-06-23 17:29:14 +0300 |
commit | ff3b9d63cbd504f17ad28a9660831c19cda81f98 (patch) | |
tree | a6b47408a86f6f23aad820376458070a76f56195 /release/scripts | |
parent | 769468d125c863ed22c152e5dda4605ce2260f06 (diff) | |
parent | 27972c4225c26780eb957ddf0c98ce4cee3d29e5 (diff) |
Merge branch 'master' into greasepencil-edit-curve
Diffstat (limited to 'release/scripts')
m--------- | release/scripts/addons | 0 | ||||
m--------- | release/scripts/addons_contrib | 0 | ||||
-rw-r--r-- | release/scripts/modules/rna_keymap_ui.py | 3 | ||||
-rw-r--r-- | release/scripts/presets/keyconfig/keymap_data/blender_default.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_paint_common.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 34 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 6 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 6 |
10 files changed, 37 insertions, 19 deletions
diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 8397b98b8cb6510869d28a84592b8d7213c3b6c +Subproject bc1262f4d61feeba235bb75046e65e0e8411241 diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject 7c36b48507f79ca62f8c038bad0fb3468c4f48e +Subproject 45aa940dabda64f7877c6d5dd843998a86f0a83 diff --git a/release/scripts/modules/rna_keymap_ui.py b/release/scripts/modules/rna_keymap_ui.py index 844daded570..6076bf00063 100644 --- a/release/scripts/modules/rna_keymap_ui.py +++ b/release/scripts/modules/rna_keymap_ui.py @@ -240,6 +240,9 @@ def draw_filtered(display_keymaps, filter_type, filter_text, layout): "*": 'NUMPAD_ASTERIX', "/": 'NUMPAD_SLASH', '+': 'NUMPAD_PLUS', + "-": 'NUMPAD_MINUS', + ".": 'NUMPAD_PERIOD', + "'": 'QUOTE', "RMB": 'RIGHTMOUSE', "LMB": 'LEFTMOUSE', "MMB": 'MIDDLEMOUSE', diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index 68340443a78..33c16b99348 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -5179,7 +5179,7 @@ def km_bevel_modal_map(_params): ("MARK_SHARP_TOGGLE", {"type": 'K', "value": 'PRESS', "any": True}, None), ("OUTER_MITER_CHANGE", {"type": 'O', "value": 'PRESS', "any": True}, None), ("INNER_MITER_CHANGE", {"type": 'I', "value": 'PRESS', "any": True}, None), - ("CUSTOM_PROFILE_TOGGLE", {"type": 'Z', "value": 'PRESS', "any": True}, None), + ("PROFILE_TYPE_CHANGE", {"type": 'Z', "value": 'PRESS', "any": True}, None), ("VERTEX_MESH_CHANGE", {"type": 'N', "value": 'PRESS', "any": True}, None), ]) diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index 1612cce3c51..c82f891ecb0 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -623,7 +623,7 @@ def brush_settings(layout, context, brush, popover=False): layout.prop(brush, "pose_origin_type") layout.prop(brush, "pose_offset") layout.prop(brush, "pose_smooth_iterations") - if brush.pose_deform_type == 'ROTATE_TWIST' and brush.pose_origin_type in ('TOPOLOGY','FACE_SETS'): + if brush.pose_deform_type == 'ROTATE_TWIST' and brush.pose_origin_type in {'TOPOLOGY', 'FACE_SETS'}: layout.prop(brush, "pose_ik_segments") layout.prop(brush, "use_pose_ik_anchored") layout.separator() diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 70d4e3c275d..fcaa715cfd8 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -176,6 +176,7 @@ class RENDER_PT_eevee_motion_blur(RenderButtonsPanel, Panel): col.prop(props, "motion_blur_shutter") col.prop(props, "motion_blur_depth_scale") col.prop(props, "motion_blur_max") + col.prop(props, "motion_blur_steps", text="Steps") class RENDER_PT_eevee_depth_of_field(RenderButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 9f26abec805..52c59431316 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -738,27 +738,40 @@ class _defs_edit_mesh: def bevel(): def draw_settings(context, layout, tool, *, extra=False): props = tool.operator_properties("mesh.bevel") - region_type = context.region.type + + region_is_header = context.region.type == 'TOOL_HEADER' if not extra: - if region_type == 'TOOL_HEADER': + if region_is_header: layout.prop(props, "offset_type", text="") else: layout.prop(props, "offset_type") layout.prop(props, "segments") - layout.prop(props, "profile", slider=True) - if region_type == 'TOOL_HEADER': + row = layout.row() + row.prop(props, "profile_type", text="" if region_is_header else None) + if props.profile_type == 'SUPERELLIPSE': + layout.prop(props, "profile", text="Shape", slider=True) + + if region_is_header: layout.popover("TOPBAR_PT_tool_settings_extra", text="...") else: extra = True - if extra or region_type != 'TOOL_HEADER': - layout.prop(props, "vertex_only") - layout.prop(props, "clamp_overlap") - layout.prop(props, "loop_slide") - layout.prop(props, "harden_normals") + if extra: + layout.use_property_split = True + layout.use_property_decorate = False + + if props.profile_type == 'CUSTOM': + layout.prop(props, "profile", text="Miter Shape", slider=True) + + col = layout.column() + col.prop(props, "vertex_only") + col.prop(props, "clamp_overlap") + col.prop(props, "loop_slide") + col.prop(props, "harden_normals") + col = layout.column(heading="Mark") col.prop(props, "mark_seam", text="Seam") col.prop(props, "mark_sharp", text="Sharp") @@ -770,8 +783,7 @@ class _defs_edit_mesh: if props.miter_inner == 'ARC': layout.prop(props, "spread") - layout.prop(props, "use_custom_profile") - if props.use_custom_profile: + if props.profile_type == 'CUSTOM': tool_settings = context.tool_settings layout.template_curveprofile(tool_settings, "custom_bevel_profile_preset") diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 436d866886b..42ae00203f3 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -2139,6 +2139,8 @@ class USERPREF_PT_experimental_system(ExperimentalPanel, Panel): self._draw_items( context, ( ({"property": "use_undo_legacy"}, "T60695"), + ({"property": "use_new_particle_system"}, "T73324"), + ({"property": "use_new_hair_type"}, "T68981"), ), ) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 0b1dfe7dc83..503ec63dd39 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -131,7 +131,7 @@ class VIEW3D_HT_tool_header(Header): if is_valid_context: brush = context.tool_settings.gpencil_sculpt_paint.brush tool = brush.gpencil_tool - if tool in ('SMOOTH', 'RANDOMIZE'): + if tool in {'SMOOTH', 'RANDOMIZE'}: layout.popover("VIEW3D_PT_tools_grease_pencil_sculpt_options") layout.popover("VIEW3D_PT_tools_grease_pencil_sculpt_appearance") elif tool_mode == 'WEIGHT_GPENCIL': @@ -2187,9 +2187,9 @@ class VIEW3D_MT_add(Menu): layout.menu("VIEW3D_MT_surface_add", icon='OUTLINER_OB_SURFACE') layout.menu("VIEW3D_MT_metaball_add", text="Metaball", icon='OUTLINER_OB_META') layout.operator("object.text_add", text="Text", icon='OUTLINER_OB_FONT') - if hasattr(bpy.data, "hairs"): + if context.preferences.experimental.use_new_hair_type: layout.operator("object.hair_add", text="Hair", icon='OUTLINER_OB_HAIR') - if hasattr(bpy.data, "pointclouds"): + if context.preferences.experimental.use_new_particle_system: layout.operator("object.pointcloud_add", text="Point Cloud", icon='OUTLINER_OB_POINTCLOUD') layout.menu("VIEW3D_MT_volume_add", text="Volume", icon='OUTLINER_OB_VOLUME') layout.operator_menu_enum("object.gpencil_add", "type", text="Grease Pencil", icon='OUTLINER_OB_GREASEPENCIL') diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 3d72a2a588c..76bac375d5b 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1694,7 +1694,7 @@ class GreasePencilSculptPanel: @classmethod def poll(cls, context): - if context.space_data.type in ('VIEW_3D', 'PROPERTIES'): + if context.space_data.type in {'VIEW_3D', 'PROPERTIES'}: if context.gpencil_data is None: return False @@ -1768,7 +1768,7 @@ class GreasePencilWeightPanel: @classmethod def poll(cls, context): - if context.space_data.type in ('VIEW_3D', 'PROPERTIES'): + if context.space_data.type in {'VIEW_3D', 'PROPERTIES'}: if context.gpencil_data is None: return False @@ -1843,7 +1843,7 @@ class GreasePencilVertexPanel: @classmethod def poll(cls, context): - if context.space_data.type in ('VIEW_3D', 'PROPERTIES'): + if context.space_data.type in {'VIEW_3D', 'PROPERTIES'}: if context.gpencil_data is None: return False |