diff options
Diffstat (limited to 'release')
4 files changed, 42 insertions, 13 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py index bef054a1f1d..22b62d27684 100644 --- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -4456,7 +4456,8 @@ def km_mesh(params): ("mesh.rip_move", {"type": 'V', "value": 'PRESS', "alt": True}, {"properties": [("MESH_OT_rip", [("use_fill", True), ],)]}), ("mesh.rip_edge_move", {"type": 'D', "value": 'PRESS', "alt": True}, None), - op_menu("VIEW3D_MT_edit_mesh_merge", {"type": 'M', "value": 'PRESS', "alt": True}), + op_menu("VIEW3D_MT_edit_mesh_merge", {"type": 'M', "value": 'PRESS'}), + op_menu("VIEW3D_MT_edit_mesh_split", {"type": 'M', "value": 'PRESS', "alt": True}), ("transform.shrink_fatten", {"type": 'S', "value": 'PRESS', "alt": True, "repeat": False}, None), ("mesh.edge_face_add", {"type": 'F', "value": 'PRESS'}, None), ("mesh.duplicate_move", {"type": 'D', "value": 'PRESS', "shift": True}, None), @@ -4560,10 +4561,11 @@ def km_armature(params): ("armature.select_more", {"type": 'NUMPAD_PLUS', "value": 'PRESS', "ctrl": True}, None), ("armature.select_less", {"type": 'NUMPAD_MINUS', "value": 'PRESS', "ctrl": True}, None), ("armature.select_similar", {"type": 'G', "value": 'PRESS', "shift": True}, None), - ("armature.select_linked", {"type": 'L', "value": 'PRESS'}, + ("armature.select_linked_pick", {"type": 'L', "value": 'PRESS'}, {"properties": [("deselect", False)]}), - ("armature.select_linked", {"type": 'L', "value": 'PRESS', "shift": True}, + ("armature.select_linked_pick", {"type": 'L', "value": 'PRESS', "shift": True}, {"properties": [("deselect", True)]}), + ("armature.select_linked", {"type": 'L', "value": 'PRESS', "ctrl": True}, None), ("armature.shortest_path_pick", {"type": params.select_mouse, "value": params.select_mouse_value, "ctrl": True}, None), # Editing. op_menu("VIEW3D_MT_edit_armature_delete", {"type": 'X', "value": 'PRESS'}), diff --git a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py index 15e526ea6a7..46beda12033 100644 --- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py +++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py @@ -3535,7 +3535,7 @@ def km_armature(params): ("armature.select_less", {"type": 'DOWN_ARROW', "value": 'PRESS'}, None), ("armature.select_similar", {"type": 'G', "value": 'PRESS', "shift": True}, None), - ("armature.select_linked", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, + ("armature.select_linked_pick", {"type": 'RIGHT_BRACKET', "value": 'PRESS'}, {"properties": [("deselect", False)]}), ("armature.shortest_path_pick", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True, "shift": True}, None), @@ -3791,7 +3791,7 @@ def km_object_non_modal(params): {"properties": [("mode", 'PAINT_GPENCIL')]}), ("object.mode_set",{"type": 'FIVE', "value": 'PRESS'}, {"properties": [("mode", 'WEIGHT_GPENCIL')]}), - + ]) return keymap diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index ba9e2110817..390b5de7d37 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -194,7 +194,8 @@ class PHYSICS_PT_settings(PhysicButtonsPanel, Panel): col.prop(domain, "gravity", text="Gravity") col = flow.column() - col.prop(domain, "clipping", text="Empty Space") + if PhysicButtonsPanel.poll_gas_domain(context): + col.prop(domain, "clipping", text="Empty Space") col.prop(domain, "delete_in_obstacle", text="Delete In Obstacle") if domain.cache_type == 'MODULAR': diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 7fca7e9c271..cbd899985bd 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1859,6 +1859,10 @@ class VIEW3D_MT_select_edit_armature(Menu): layout.separator() + layout.operator("armature.select_linked", text="Linked") + + layout.separator() + props = layout.operator("armature.select_hierarchy", text="Parent") props.extend = False props.direction = 'PARENT' @@ -3612,7 +3616,15 @@ class VIEW3D_MT_edit_mesh(Menu): layout.operator("mesh.duplicate_move", text="Duplicate") layout.menu("VIEW3D_MT_edit_mesh_extrude") - layout.operator("mesh.split") + + layout.separator() + + layout.menu("VIEW3D_MT_edit_mesh_merge", text="Merge") + layout.menu("VIEW3D_MT_edit_mesh_split", text="Split") + layout.operator_menu_enum("mesh.separate", "type") + + layout.separator() + layout.operator("mesh.bisect") layout.operator("mesh.knife_project") @@ -3634,7 +3646,6 @@ class VIEW3D_MT_edit_mesh(Menu): layout.separator() layout.menu("VIEW3D_MT_edit_mesh_showhide") - layout.operator_menu_enum("mesh.separate", "type") layout.menu("VIEW3D_MT_edit_mesh_clean") layout.separator() @@ -3942,10 +3953,6 @@ class VIEW3D_MT_edit_mesh_vertices(Menu): layout.separator() - layout.menu("VIEW3D_MT_edit_mesh_merge", text="Merge Vertices") - - layout.separator() - layout.menu("VIEW3D_MT_vertex_group") layout.menu("VIEW3D_MT_hook") @@ -4018,7 +4025,6 @@ class VIEW3D_MT_edit_mesh_edges(Menu): layout.separator() layout.operator("transform.edge_slide") - layout.operator("mesh.edge_split") layout.separator() @@ -4296,6 +4302,19 @@ class VIEW3D_MT_edit_mesh_merge(Menu): layout.operator("mesh.remove_doubles", text="By Distance") +class VIEW3D_MT_edit_mesh_split(Menu): + bl_label = "Split" + + def draw(self, _context): + layout = self.layout + + layout.operator("mesh.split", text="Selection") + + layout.separator() + + layout.operator_enum("mesh.edge_split", "type") + + class VIEW3D_MT_edit_mesh_showhide(ShowHideMenu, Menu): _operator_name = "mesh" @@ -4337,6 +4356,9 @@ def draw_curve(self, _context): layout.operator("curve.split") layout.operator("curve.separate") + + layout.separator() + layout.operator("curve.cyclic_toggle") layout.operator_menu_enum("curve.spline_type_set", "type") @@ -4641,6 +4663,9 @@ class VIEW3D_MT_edit_armature(Menu): layout.operator("armature.duplicate_move") layout.operator("armature.fill") + + layout.separator() + layout.operator("armature.split") layout.operator("armature.separate") @@ -7419,6 +7444,7 @@ classes = ( VIEW3D_MT_edit_mesh_clean, VIEW3D_MT_edit_mesh_delete, VIEW3D_MT_edit_mesh_merge, + VIEW3D_MT_edit_mesh_split, VIEW3D_MT_edit_mesh_showhide, VIEW3D_MT_paint_gpencil, VIEW3D_MT_assign_material, |