diff options
author | Joseph Eagar <joeedh@gmail.com> | 2021-09-18 06:13:39 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2021-09-18 06:13:39 +0300 |
commit | f0c35d16f39d837c7bceb6740d3fe9c440676564 (patch) | |
tree | e88f2b8ef0a2999cb45a7c83d5e88d1aa6df0044 /release/scripts | |
parent | d3bba94bf243c82b0c94b176f0541511e29bbcf3 (diff) | |
parent | 6cf734a2e5d2496d1b2d33bc7613b56a9f9fc2ec (diff) |
Merge branch 'master' into temp_bmesh_multirestemp_bmesh_multires
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/modules/bl_keymap_utils/io.py | 15 | ||||
-rw-r--r-- | release/scripts/modules/rna_keymap_ui.py | 10 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_mask_common.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_dopesheet.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_graph.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_node.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_topbar.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 15 | ||||
-rw-r--r-- | release/scripts/startup/nodeitems_builtins.py | 2 |
10 files changed, 33 insertions, 15 deletions
diff --git a/release/scripts/modules/bl_keymap_utils/io.py b/release/scripts/modules/bl_keymap_utils/io.py index 96832cbd9c7..d8b68822feb 100644 --- a/release/scripts/modules/bl_keymap_utils/io.py +++ b/release/scripts/modules/bl_keymap_utils/io.py @@ -63,16 +63,11 @@ def kmi_args_as_data(kmi): if kmi.any: s.append("\"any\": True") else: - if kmi.shift: - s.append("\"shift\": True") - if kmi.ctrl: - s.append("\"ctrl\": True") - if kmi.alt: - s.append("\"alt\": True") - if kmi.oskey: - s.append("\"oskey\": True") - if kmi.key_modifier and kmi.key_modifier != 'NONE': - s.append(f"\"key_modifier\": '{kmi.key_modifier}'") + for attr in ("shift", "ctrl", "alt", "oskey"): + if mod := getattr(kmi, attr): + s.append(f"\"{attr:s}\": " + ("-1" if mod == -1 else "True")) + if (mod := kmi.key_modifier) and (mod != 'NONE'): + s.append(f"\"key_modifier\": '{mod:s}'") if kmi.repeat: if ( diff --git a/release/scripts/modules/rna_keymap_ui.py b/release/scripts/modules/rna_keymap_ui.py index b42539ac44a..08035d25481 100644 --- a/release/scripts/modules/rna_keymap_ui.py +++ b/release/scripts/modules/rna_keymap_ui.py @@ -199,10 +199,12 @@ def draw_kmi(display_keymaps, kc, km, kmi, layout, level): subrow = sub.row() subrow.scale_x = 0.75 subrow.prop(kmi, "any", toggle=True) - subrow.prop(kmi, "shift", toggle=True) - subrow.prop(kmi, "ctrl", toggle=True) - subrow.prop(kmi, "alt", toggle=True) - subrow.prop(kmi, "oskey", text="Cmd", toggle=True) + # Use `*_ui` properties as integers aren't practical. + subrow.prop(kmi, "shift_ui", toggle=True) + subrow.prop(kmi, "ctrl_ui", toggle=True) + subrow.prop(kmi, "alt_ui", toggle=True) + subrow.prop(kmi, "oskey_ui", text="Cmd", toggle=True) + subrow.prop(kmi, "key_modifier", text="", event=True) # Operator properties diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py index 40a704a65dd..705539e979c 100644 --- a/release/scripts/startup/bl_ui/properties_mask_common.py +++ b/release/scripts/startup/bl_ui/properties_mask_common.py @@ -417,6 +417,7 @@ class MASK_MT_select(Menu): layout.operator("mask.select_box") layout.operator("mask.select_circle") + layout.operator_menu_enum("mask.select_lasso", "mode") layout.separator() diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index a1e5b509295..c18d77987ad 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -1578,6 +1578,7 @@ class CLIP_MT_select(Menu): layout.operator("clip.select_box") layout.operator("clip.select_circle") + layout.operator_menu_enum("clip.select_lasso", "mode") layout.separator() diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index 84d1c36c53d..781c430a752 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -394,6 +394,7 @@ class DOPESHEET_MT_select(Menu): layout.operator("action.select_box", text="Box Select (Axis Range)").axis_range = True layout.operator("action.select_circle") + layout.operator_menu_enum("action.select_lasso", "mode") layout.separator() layout.operator("action.select_column", text="Columns on Selected Keys").mode = 'KEYS' diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index f8521592dd9..612b7ba2b09 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -179,6 +179,7 @@ class GRAPH_MT_select(Menu): props.include_handles = True layout.operator("graph.select_circle") + layout.operator_menu_enum("graph.select_lasso", "mode") layout.separator() layout.operator("graph.select_column", text="Columns on Selected Keys").mode = 'KEYS' diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index fba86676ad4..5f36009901a 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -289,6 +289,7 @@ class NODE_MT_select(Menu): layout.operator("node.select_box").tweak = False layout.operator("node.select_circle") + layout.operator_menu_enum("node.select_lasso", "mode") layout.separator() layout.operator("node.select_all").action = 'TOGGLE' diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py index b409e9079be..1d75ad8ff0a 100644 --- a/release/scripts/startup/bl_ui/space_topbar.py +++ b/release/scripts/startup/bl_ui/space_topbar.py @@ -655,6 +655,7 @@ class TOPBAR_MT_window(Menu): layout.separator() layout.operator("screen.screenshot") + layout.operator("screen.screenshot_area") if sys.platform[:3] == "win": layout.separator() diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index c8c1858d914..1c2c73a2600 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1363,6 +1363,7 @@ class VIEW3D_MT_select_object(Menu): layout.operator("view3d.select_box") layout.operator("view3d.select_circle") + layout.operator_menu_enum("view3d.select_lasso", "mode") layout.separator() @@ -1423,6 +1424,7 @@ class VIEW3D_MT_select_pose(Menu): layout.operator("view3d.select_box") layout.operator("view3d.select_circle") + layout.operator_menu_enum("view3d.select_lasso", "mode") layout.separator() @@ -1457,6 +1459,7 @@ class VIEW3D_MT_select_particle(Menu): layout.operator("view3d.select_box") layout.operator("view3d.select_circle") + layout.operator_menu_enum("view3d.select_lasso", "mode") layout.separator() @@ -1563,6 +1566,7 @@ class VIEW3D_MT_select_edit_mesh(Menu): layout.operator("view3d.select_box") layout.operator("view3d.select_circle") + layout.operator_menu_enum("view3d.select_lasso", "mode") layout.separator() @@ -1616,6 +1620,7 @@ class VIEW3D_MT_select_edit_curve(Menu): layout.operator("view3d.select_box") layout.operator("view3d.select_circle") + layout.operator_menu_enum("view3d.select_lasso", "mode") layout.separator() @@ -1651,6 +1656,7 @@ class VIEW3D_MT_select_edit_surface(Menu): layout.operator("view3d.select_box") layout.operator("view3d.select_circle") + layout.operator_menu_enum("view3d.select_lasso", "mode") layout.separator() @@ -1712,6 +1718,7 @@ class VIEW3D_MT_select_edit_metaball(Menu): layout.operator("view3d.select_box") layout.operator("view3d.select_circle") + layout.operator_menu_enum("view3d.select_lasso", "mode") layout.separator() @@ -1753,6 +1760,7 @@ class VIEW3D_MT_select_edit_lattice(Menu): layout.operator("view3d.select_box") layout.operator("view3d.select_circle") + layout.operator_menu_enum("view3d.select_lasso", "mode") layout.separator() @@ -1783,6 +1791,7 @@ class VIEW3D_MT_select_edit_armature(Menu): layout.operator("view3d.select_box") layout.operator("view3d.select_circle") + layout.operator_menu_enum("view3d.select_lasso", "mode") layout.separator() @@ -1850,6 +1859,7 @@ class VIEW3D_MT_select_gpencil(Menu): layout.operator("gpencil.select_box") layout.operator("gpencil.select_circle") + layout.operator_menu_enum("gpencil.select_lasso", "mode") layout.separator() @@ -1886,6 +1896,7 @@ class VIEW3D_MT_select_paint_mask(Menu): layout.operator("view3d.select_box") layout.operator("view3d.select_circle") + layout.operator_menu_enum("view3d.select_lasso", "mode") layout.separator() @@ -1906,6 +1917,7 @@ class VIEW3D_MT_select_paint_mask_vertex(Menu): layout.operator("view3d.select_box") layout.operator("view3d.select_circle") + layout.operator_menu_enum("view3d.select_lasso", "mode") layout.separator() @@ -3984,6 +3996,7 @@ class VIEW3D_MT_edit_mesh_vertices(Menu): layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("mesh.extrude_vertices_move", text="Extrude Vertices") + layout.operator("mesh.dupli_extrude_cursor").rotate_source = True layout.operator("mesh.bevel", text="Bevel Vertices").affect = 'VERTICES' layout.separator() @@ -4415,6 +4428,7 @@ class VIEW3D_MT_edit_curve_ctrlpoints(Menu): if edit_object.type in {'CURVE', 'SURFACE'}: layout.operator("curve.extrude_move") + layout.operator("curve.vertex_add") layout.separator() @@ -4743,6 +4757,7 @@ class VIEW3D_MT_edit_armature(Menu): layout.separator() layout.operator("armature.extrude_move") + layout.operator("armature.click_extrude") if arm.use_mirror_x: layout.operator("armature.extrude_forked") diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index 569c5291576..ecf07edb9f3 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -500,8 +500,8 @@ geometry_node_categories = [ NodeItem("GeometryNodeLegacyAttributeSeparateXYZ", poll=geometry_nodes_fields_legacy_poll), NodeItem("GeometryNodeLegacyAttributeMapRange", poll=geometry_nodes_fields_legacy_poll), NodeItem("GeometryNodeLegacyAttributeTransfer", poll=geometry_nodes_fields_legacy_poll), + NodeItem("GeometryNodeAttributeRemove", poll=geometry_nodes_fields_legacy_poll), - NodeItem("GeometryNodeAttributeRemove"), NodeItem("GeometryNodeAttributeCapture", poll=geometry_nodes_fields_poll), ]), GeometryNodeCategory("GEO_COLOR", "Color", items=[ |