Merging trunk up to r38167.

[blender-staging.git] / 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 e1efd5b4622835498627083945c9cc2f3ad1ae7e..1ed262c3e2310c9af9cae783f136c39d5900e935 100644 (file)
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -644,10 +644,12 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, Sequence *seq, int outline
        if (G.moving && (seq->flag & SELECT)) {
                if(seq->flag & SEQ_OVERLAP) {
                        col[0]= 255; col[1]= col[2]= 40;
-               } else UI_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 120);
+               }
+               else
+                       UI_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 120+outline_tint);
        }
-
-       UI_GetColorPtrBlendShade3ubv(col, col, col, 0.0, outline_tint);
+       else
+               UI_GetColorPtrBlendShade3ubv(col, col, col, 0.0, outline_tint);
        
        glColor3ubv((GLubyte *)col);
        
@@ -970,7 +972,7 @@ static void draw_seq_strips(const bContext *C, Editing *ed, ARegion *ar)
                /* loop through strips, checking for those that are visible */
                for (seq= ed->seqbasep->first; seq; seq= seq->next) {
                        /* boundbox and selection tests for NOT drawing the strip... */
-                       if ((seq->flag & SELECT) == sel) continue;
+                       if ((seq->flag & SELECT) != sel) continue;
                        else if (seq == last_seq) continue;
                        else if (MIN2(seq->startdisp, seq->start) > v2d->cur.xmax) continue;
                        else if (MAX2(seq->enddisp, seq->start+seq->len) < v2d->cur.xmin) continue;