[Bf-blender-cvs] [440bce242d9] blender2.8: Keyframe Drawing: Fix 2.7 -> 2.8 regressions

[Joshua Leung]

Commit: 440bce242d9540859b073af7f6fb99c17fc4eeed
Author: Joshua Leung
Date:   Thu Aug 3 01:25:55 2017 +1200
Branches: blender2.8
https://developer.blender.org/rB440bce242d9540859b073af7f6fb99c17fc4eeed

Keyframe Drawing: Fix 2.7 -> 2.8 regressions

* Outlines of keyframes were too thick and ugly

* Size differences between keyframe types was being swallowed
  by the pixel-fudge factor, leaving colour as the only distinguishing
  factor (bad!)

===================================================================

M	source/blender/editors/animation/keyframes_draw.c
M	source/blender/gpu/shaders/gpu_shader_keyframe_diamond_vert.glsl

===================================================================

diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c
index 97e5597326e..8d7c32846b3 100644
--- a/source/blender/editors/animation/keyframes_draw.c
+++ b/source/blender/editors/animation/keyframes_draw.c
@@ -492,7 +492,7 @@ void draw_keyframe_shape(float x, float y, float size, bool sel, short key_type,
 			break;
 		
 		default:
-			size -= 0.5f * key_type;
+			size -= 0.8f * key_type;
 	}
 
 	unsigned char fill_col[4];
diff --git a/source/blender/gpu/shaders/gpu_shader_keyframe_diamond_vert.glsl b/source/blender/gpu/shaders/gpu_shader_keyframe_diamond_vert.glsl
index b86d6fd70fe..c49832bf9b4 100644
--- a/source/blender/gpu/shaders/gpu_shader_keyframe_diamond_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_keyframe_diamond_vert.glsl
@@ -2,7 +2,7 @@
 uniform mat4 ModelViewProjectionMatrix;
 
 const float pixel_fudge = sqrt(2.0);
-const float outline_width = 1.25 * pixel_fudge;
+const float outline_width = 1.15 * pixel_fudge;
 
 in vec2 pos;
 in float size;