[Bf-blender-cvs] [3280adc0aa3] blender2.8: Fix T57977: VSE: Markers lines get highlighted when using box select

Clément Foucault noreply at git.blender.org
Thu Nov 22 16:15:18 CET 2018


Commit: 3280adc0aa31ad5bccd35ef02da6a48c37b3fbde
Author: Clément Foucault
Date:   Thu Nov 22 16:13:18 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB3280adc0aa31ad5bccd35ef02da6a48c37b3fbde

Fix T57977: VSE: Markers lines get highlighted when using box select

Was caused by a missing uniform.

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

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 4d21ed8b5b4..f82250df4d3 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -416,6 +416,7 @@ static void draw_marker(
 		else {
 			immUniformColor4f(0.0f, 0.0f, 0.0f, 0.38f);
 		}
+		immUniform1i("colors_len", 0);  /* "simple" mode */
 		immUniform1f("dash_width", 6.0f);
 		immUniform1f("dash_factor", 0.5f);



More information about the Bf-blender-cvs mailing list