[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38151] trunk/blender/source/blender/ editors/space_sequencer/sequencer_draw.c: Fix #27879: sequencer didn' t draw overlapping strips well, selected were drawn

[Brecht Van Lommel]

Revision: 38151
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38151
Author:   blendix
Date:     2011-07-06 13:15:22 +0000 (Wed, 06 Jul 2011)
Log Message:
-----------
Fix #27879: sequencer didn't draw overlapping strips well, selected were drawn
under unselected, and active strips red border color for active strips was not
clear enough.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2011-07-06 12:33:33 UTC (rev 38150)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2011-07-06 13:15:22 UTC (rev 38151)
@@ -643,10 +643,12 @@
 	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);
 	
@@ -969,7 +971,7 @@
 		/* 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;