[Bf-blender-cvs] [69a17bce1a] blender2.8: Cleanup: remove useless `glDisable(GL_LINE_STIPPLE)` call.
Bastien Montagne
noreply at git.blender.org
Mon Mar 20 14:50:02 CET 2017
Commit: 69a17bce1a29f89859d0148733e8f1086b033432
Author: Bastien Montagne
Date: Mon Mar 20 14:46:26 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB69a17bce1a29f89859d0148733e8f1086b033432
Cleanup: remove useless `glDisable(GL_LINE_STIPPLE)` call.
Note that muted strips have solid border currently, marked as TODO to
add back stippled lines (if with want them back?).
===================================================================
M source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index b64a372e7f..3da0150a75 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -829,6 +829,7 @@ static void draw_seq_strip(const bContext *C, SpaceSeq *sseq, Scene *scene, AReg
pos = add_attrib(immVertexFormat(), "pos", GL_FLOAT, 2, KEEP_FLOAT);
+ /* TODO: add back stippled line for muted strips? */
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
if (seq->flag & SEQ_MUTE) {
@@ -845,10 +846,6 @@ static void draw_seq_strip(const bContext *C, SpaceSeq *sseq, Scene *scene, AReg
imm_draw_line_box(pos, x1, y1, x2, y2); /* outline */
- if (seq->flag & SEQ_MUTE) {
- glDisable(GL_LINE_STIPPLE);
- }
-
immUnbindProgram();
/* calculate if seq is long enough to print a name */
More information about the Bf-blender-cvs
mailing list