diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-05-15 09:33:29 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-05-15 09:33:29 +0300 |
commit | c2568394dd71853e67b607be5f0b10d24399421e (patch) | |
tree | 56cc3e9c36c16b3512b78da57b6ddcd8bae4db5e /source/blender | |
parent | a9d8474fda7f9cc9db52b505cae854db9870d1ce (diff) |
Fix T57203: Rotation overlaps scale gizmo handles
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/transform/transform_gizmo_3d.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index 50610f1b3da..35fda39e8dc 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -1762,6 +1762,15 @@ static void WIDGETGROUP_gizmo_refresh(const bContext *C, wmGizmoGroup *gzgroup) } } MAN_ITER_AXES_END; + + /* Ensure rotate disks don't overlap scale arrows, especially in ortho view. */ + float rotate_select_bias = 0.0f; + if ((ggd->twtype & V3D_GIZMO_SHOW_OBJECT_SCALE) && ggd->twtype & V3D_GIZMO_SHOW_OBJECT_ROTATE) { + rotate_select_bias = -2.0f; + } + for (int i = MAN_AXIS_RANGE_ROT_START; i < MAN_AXIS_RANGE_ROT_END; i++) { + ggd->gizmos[i]->select_bias = rotate_select_bias; + } } static void WIDGETGROUP_gizmo_message_subscribe(const bContext *C, |