From e7d57628c955c1843c70c8fc5023f5d8954847bd Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Tue, 28 Feb 2017 01:21:27 -0500 Subject: OpenGL: keyframe shape fixes - Size parameter is total size of the shape, not its radius (half size). Updated hard-coded sizes to match this. - Shader expands size to include outline. - Fixed fringe between outline color and transparent background. --- source/blender/gpu/shaders/gpu_shader_keyframe_diamond_frag.glsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/gpu/shaders/gpu_shader_keyframe_diamond_frag.glsl') diff --git a/source/blender/gpu/shaders/gpu_shader_keyframe_diamond_frag.glsl b/source/blender/gpu/shaders/gpu_shader_keyframe_diamond_frag.glsl index 43a7e42153a..ebda79558c7 100644 --- a/source/blender/gpu/shaders/gpu_shader_keyframe_diamond_frag.glsl +++ b/source/blender/gpu/shaders/gpu_shader_keyframe_diamond_frag.glsl @@ -29,7 +29,7 @@ void main() { float mid_stroke = 0.5 * (radii[1] + radii[2]); - vec4 backgroundColor = vec4(finalColor.rgb, 0.0); + vec4 backgroundColor = vec4(finalOutlineColor.rgb, 0.0); if (dist > mid_stroke) fragColor = mix(finalOutlineColor, backgroundColor, smoothstep(radii[1], radii[0], dist)); -- cgit v1.2.3