forked from bartvdbraak/blender
VSE: minor drawing glitch with meta's
Meta contents could obscure meta selection outline, draw after.
This commit is contained in:
parent
28398f654d
commit
81f435202a
@ -839,25 +839,25 @@ static void draw_seq_strip(const bContext *C, SpaceSeq *sseq, Scene *scene, AReg
|
|||||||
else
|
else
|
||||||
UI_GetColorPtrShade3ubv(col, col, outline_tint);
|
UI_GetColorPtrShade3ubv(col, col, outline_tint);
|
||||||
|
|
||||||
glColor3ubv((GLubyte *)col);
|
if ((seq->type == SEQ_TYPE_META) ||
|
||||||
|
((seq->type == SEQ_TYPE_SCENE) && (seq->flag & SEQ_SCENE_STRIPS)))
|
||||||
|
{
|
||||||
|
drawmeta_contents(scene, seq, x1, y1, x2, y2);
|
||||||
|
}
|
||||||
|
|
||||||
if (seq->flag & SEQ_MUTE) {
|
if (seq->flag & SEQ_MUTE) {
|
||||||
glEnable(GL_LINE_STIPPLE);
|
glEnable(GL_LINE_STIPPLE);
|
||||||
glLineStipple(1, 0x8888);
|
glLineStipple(1, 0x8888);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
glColor3ubv((GLubyte *)col);
|
||||||
|
|
||||||
UI_draw_roundbox_shade_x(GL_LINE_LOOP, x1, y1, x2, y2, 0.0, 0.1, 0.0);
|
UI_draw_roundbox_shade_x(GL_LINE_LOOP, x1, y1, x2, y2, 0.0, 0.1, 0.0);
|
||||||
|
|
||||||
if (seq->flag & SEQ_MUTE) {
|
if (seq->flag & SEQ_MUTE) {
|
||||||
glDisable(GL_LINE_STIPPLE);
|
glDisable(GL_LINE_STIPPLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((seq->type == SEQ_TYPE_META) ||
|
|
||||||
((seq->type == SEQ_TYPE_SCENE) && (seq->flag & SEQ_SCENE_STRIPS)))
|
|
||||||
{
|
|
||||||
drawmeta_contents(scene, seq, x1, y1, x2, y2);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* calculate if seq is long enough to print a name */
|
/* calculate if seq is long enough to print a name */
|
||||||
x1 = seq->startdisp + handsize_clamped;
|
x1 = seq->startdisp + handsize_clamped;
|
||||||
x2 = seq->enddisp - handsize_clamped;
|
x2 = seq->enddisp - handsize_clamped;
|
||||||
|
Loading…
Reference in New Issue
Block a user