From 0909b564a9330a9c1c4c5df3b05bf77ae20e8927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Thu, 14 May 2020 15:44:49 +0200 Subject: Fix T76413 Gizmos: Trackball's preselection highlighting is too bright This was caused by the sRGB viewport changes. The fix is to modify the alpha values manually. --- source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c | 2 +- source/blender/editors/transform/transform_gizmo_3d.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c index 32c72f12948..262f4b78b95 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.c @@ -381,7 +381,7 @@ static void dial_ghostarc_draw_with_helplines(const float angle_ofs, { /* Coordinate at which the arc drawing will be started. */ const float co_outer[4] = {0.0f, DIAL_WIDTH, 0.0f}; - const float color_arc_inner[4] = {0.8f, 0.8f, 0.8f, 0.4f}; + const float color_arc_inner[4] = {0.8f, 0.8f, 0.8f, 0.2f}; dial_ghostarc_draw(angle_ofs, angle_delta, arc_inner_factor, color_arc_inner); float line_width = (draw_options & ED_GIZMO_DIAL_DRAW_FLAG_ANGLE_VALUE) ? 3.0f : 1.0f; diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c index aa298b04d1a..4e0bebe2f4c 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.c +++ b/source/blender/editors/transform/transform_gizmo_3d.c @@ -347,7 +347,7 @@ static void gizmo_get_axis_color(const int axis_idx, if (axis_idx >= MAN_AXIS_RANGE_ROT_START && axis_idx < MAN_AXIS_RANGE_ROT_END) { /* Never fade rotation rings. */ /* trackball rotation axis is a special case, we only draw a slight overlay */ - alpha_fac = (axis_idx == MAN_AXIS_ROT_T) ? 0.1f : 1.0f; + alpha_fac = (axis_idx == MAN_AXIS_ROT_T) ? 0.05f : 1.0f; } else { bool is_plane = false; -- cgit v1.2.3