diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-07-11 11:38:01 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-11 11:49:18 +0300 |
commit | c17611af951e46fb82bf43d7449240f2f829b78f (patch) | |
tree | 51992764ea21b663b68c6aabb11fea843d115474 /release | |
parent | 64d40c82c324f7029e27ff59a4b1ca3200cddbef (diff) |
Manipulator: changes for overlay options
There are now 3 categories in the overlay popover:
- Navigation
- Active (camera, lamp... etc)
- Tool (manipulator)
The user preference for mini axis now controls if the mini axis
displays minimal or a full-interactive widget.
Part of design: T55863
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 12 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 14 |
2 files changed, 19 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index e44fd6e09db..ca96c79b2b4 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -238,15 +238,15 @@ class USERPREF_PT_interface(Panel): col.separator() - col.prop(view, "show_manipulator_navigate") + # col.prop(view, "show_manipulator_navigate") sub = col.column(align=True) - sub.prop(view, "show_mini_axis", text="Display Mini Axis") - sub.active = not view.show_manipulator_navigate + sub.label("3D Viewport Axis:") + sub.row().prop(view, "mini_axis_type", expand=True) sub = col.column(align=True) - sub.active = view.show_mini_axis + sub.active = view.mini_axis_type == 'MINIMAL' sub.prop(view, "mini_axis_size", text="Size") sub.prop(view, "mini_axis_brightness", text="Brightness") @@ -258,9 +258,7 @@ class USERPREF_PT_interface(Panel): #col.label(text="Open Toolbox Delay:") #col.prop(view, "open_left_mouse_delay", text="Hold LMB") #col.prop(view, "open_right_mouse_delay", text="Hold RMB") - col.prop(view, "show_manipulator", text="Transform Manipulator") - # Currently not working - # col.prop(view, "show_manipulator_shaded") + col.prop(view, "show_manipulator", text="Manipulators") sub = col.column() sub.active = view.show_manipulator sub.prop(view, "manipulator_size", text="Size") diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index b484bf08c3b..3e97877c115 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3882,6 +3882,20 @@ class VIEW3D_PT_overlay(Panel): sub = split.column() sub.prop(view, "show_manipulator", text="Manipulators") + has_manipulator = view.show_manipulator + subsub = sub.column() + subsub.active = has_manipulator + subsub.prop(view, "show_manipulator_navigate", text="Navigate") + del subsub + sub = split.column() + sub.active = has_manipulator + sub.prop(view, "show_manipulator_context", text="Active Object") + sub.prop(view, "show_manipulator_tool", text="Active Tools") + + col.separator() + + split = col.split() + sub = split.column() sub.prop(overlay, "show_text", text="Text") sub.prop(overlay, "show_cursor", text="3D Cursor") sub.prop(overlay, "show_outline_selected") |