[Bf-blender-cvs] [76c6f38ae4c] master: UI: Use scrubbing theme setting for markers background.

Pablo Vazquez noreply at git.blender.org
Tue May 7 16:00:16 CEST 2019


Commit: 76c6f38ae4cb20abcedb1c03aaa5c9159775502c
Author: Pablo Vazquez
Date:   Tue May 7 15:56:12 2019 +0200
Branches: master
https://developer.blender.org/rB76c6f38ae4cb20abcedb1c03aaa5c9159775502c

UI: Use scrubbing theme setting for markers background.

The hard-coded transparency of just 16 made it hard to see the markers
when the background was busy with keyframes (or strips in VSE).

The rename of the setting is in the following commit.

Reviewers: billreynish

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

M	source/blender/editors/animation/anim_markers.c

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

diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 66cdae07a36..38024ad73d2 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -481,7 +481,9 @@ static void draw_markers_background(rctf *rect)
   uint pos = GPU_vertformat_attr_add(immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
   immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 
-  const unsigned char shade[4] = {0, 0, 0, 16};
+  const unsigned char shade[4];
+  UI_GetThemeColor4ubv(TH_SCRUBBING_BACKGROUND, shade);
+
   immUniformColor4ubv(shade);
 
   GPU_blend(true);



More information about the Bf-blender-cvs mailing list