diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-06-25 14:34:21 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-06-25 15:55:49 +0300 |
commit | d08312463b27651171be1c487633804f6ea98d65 (patch) | |
tree | 2add8bb9dd20df5cba03664fdb1917ec13b6a1eb /source/blender/editors/space_view3d/view3d_draw.c | |
parent | f472ac391c18486db1933afa95831adc98fce3d2 (diff) |
Preferences: changes to navigation gizmo
- Add 'Navigation Buttons' preference, used for 2D views
(previously this couldn't be disabled).
- Add "Off" option for 3D view axis.
- Support minimal axis with navigation buttons.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_draw.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 5731da18511..d14a6870a6c 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1374,13 +1374,19 @@ void view3d_draw_region_info(const bContext *C, ARegion *ar) BLF_batch_draw_begin(); - if ((U.uiflag & USER_SHOW_GIZMO_AXIS) || - /* No need to display gizmo and this info. */ - (v3d->gizmo_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_NAVIGATE))) { + if (v3d->gizmo_flag & (V3D_GIZMO_HIDE | V3D_GIZMO_HIDE_NAVIGATE)) { /* pass */ } else { - draw_view_axis(rv3d, &rect); + switch ((eUserpref_MiniAxisType)U.mini_axis_type) { + case USER_MINI_AXIS_TYPE_GIZMO: + /* The gizmo handles it's own drawing. */ + break; + case USER_MINI_AXIS_TYPE_MINIMAL: + draw_view_axis(rv3d, &rect); + case USER_MINI_AXIS_TYPE_NONE: + break; + } } int xoffset = rect.xmin + U.widget_unit; |