diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2022-11-10 22:03:13 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2022-11-10 22:03:13 +0300 |
| commit | 140a83e2023041fed7e48028faf0f1d3e3faf0fc (patch) | |
| tree | f7633b780dc6c3897f0879392fd564feee668b58 /release | |
| parent | 24bd098dbaf8d26511cb416badb8489d1fcfe00b (diff) | |
| parent | 366796bbbe71c246ad436da07a721f2a8deafe5c (diff) | |
Merge remote-tracking branch 'origin/master' into tmp-vfx-platform-2023
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_nla.py | 5 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 4 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_nla.py b/release/scripts/startup/bl_ui/space_nla.py index a1c7e5c54de..b43434d9988 100644 --- a/release/scripts/startup/bl_ui/space_nla.py +++ b/release/scripts/startup/bl_ui/space_nla.py @@ -310,6 +310,11 @@ class NLA_MT_context_menu(Menu): layout.separator() + layout.operator("nla.meta_add") + layout.operator("nla.meta_remove") + + layout.separator() + layout.operator("nla.swap") layout.separator() diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 947f9056df7..7e0f41f7c86 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3212,11 +3212,11 @@ class VIEW3D_MT_sculpt(Menu): props.action = 'SHOW' props.area = 'ALL' - props = layout.operator("paint.hide_show", text="Show Bounding Box") + props = layout.operator("paint.hide_show", text="Box Show") props.action = 'SHOW' props.area = 'INSIDE' - props = layout.operator("paint.hide_show", text="Hide Bounding Box") + props = layout.operator("paint.hide_show", text="Box Hide") props.action = 'HIDE' props.area = 'INSIDE' diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 111fb0d8bae..8ebc385a8ee 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1020,6 +1020,7 @@ class VIEW3D_PT_sculpt_symmetry(Panel, View3DPaintPanel): layout.prop(sculpt, "symmetrize_direction") layout.operator("sculpt.symmetrize") + layout.prop(WindowManager.operator_properties_last("sculpt.symmetrize"), "merge_tolerance") class VIEW3D_PT_sculpt_symmetry_for_topbar(Panel): |