diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-11-05 09:50:53 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-11-05 09:50:53 +0300 |
commit | cc601e0eacccd53255f50702075e64aad63f6d6e (patch) | |
tree | 64df3e9ff507d8dd2f4b7d182f344954dc2ab753 /release/scripts/startup/bl_ui | |
parent | 1ef2cbb3d9cdf8f4a7d3ff5ffe9af4f97909b849 (diff) | |
parent | bfa761d046e8322f783d4f0019ee5037a704f98c (diff) |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'release/scripts/startup/bl_ui')
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 8ff0ba7bce4..fce79fc115a 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -453,13 +453,7 @@ class VIEW3D_HT_header(Header): # Pivot if object_mode in {'OBJECT', 'EDIT', 'EDIT_GPENCIL', 'SCULPT_GPENCIL'} or has_pose_mode: - layout.prop_with_popover( - tool_settings, - "transform_pivot_point", - text="", - icon_only=True, - panel="VIEW3D_PT_pivot_point", - ) + layout.prop(tool_settings, "transform_pivot_point", text="", icon_only=True) # Snap show_snap = False @@ -6042,21 +6036,6 @@ class VIEW3D_PT_overlay_weight_paint(Panel): col.prop(overlay, "show_paint_wire") -class VIEW3D_PT_pivot_point(Panel): - bl_space_type = 'VIEW_3D' - bl_region_type = 'HEADER' - bl_label = "Pivot Point" - bl_ui_units_x = 8 - - def draw(self, context): - tool_settings = context.tool_settings - - layout = self.layout - col = layout.column() - col.label(text="Pivot Point") - col.prop(tool_settings, "transform_pivot_point", expand=True) - - class VIEW3D_PT_snapping(Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'HEADER' @@ -6932,7 +6911,6 @@ classes = ( VIEW3D_PT_overlay_weight_paint, VIEW3D_PT_overlay_pose, VIEW3D_PT_overlay_sculpt, - VIEW3D_PT_pivot_point, VIEW3D_PT_snapping, VIEW3D_PT_proportional_edit, VIEW3D_PT_gpencil_origin, |