1 files changed, 339 insertions, 318 deletions

diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index d29af06bbcd..cd0c8779c39 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -68,8 +68,8 @@
 #include "sequencer_intern.h"
 
 
-#define SEQ_LEFTHANDLE		1
-#define SEQ_RIGHTHANDLE	2
+#define SEQ_LEFTHANDLE      1
+#define SEQ_RIGHTHANDLE 2
 
 
 /* Note, Don't use SEQ_BEGIN/SEQ_END while drawing!
@@ -81,91 +81,91 @@ static void get_seq_color3ubv(Scene *curscene, Sequence *seq, unsigned char col[
 	unsigned char blendcol[3];
 	SolidColorVars *colvars = (SolidColorVars *)seq->effectdata;
 
-	switch(seq->type) {
-	case SEQ_IMAGE:
-		UI_GetThemeColor3ubv(TH_SEQ_IMAGE, col);
-		break;
-		
-	case SEQ_META:
-		UI_GetThemeColor3ubv(TH_SEQ_META, col);
-		break;
-		
-	case SEQ_MOVIE:
-		UI_GetThemeColor3ubv(TH_SEQ_MOVIE, col);
-		break;
+	switch (seq->type) {
+		case SEQ_IMAGE:
+			UI_GetThemeColor3ubv(TH_SEQ_IMAGE, col);
+			break;
 
-	case SEQ_MOVIECLIP:
-		UI_GetThemeColor3ubv(TH_SEQ_MOVIECLIP, col);
-		break;
-		
-	case SEQ_SCENE:
-		UI_GetThemeColor3ubv(TH_SEQ_SCENE, col);
-		
-		if (seq->scene==curscene) {
-			UI_GetColorPtrShade3ubv(col, col, 20);
-		}
-		break;
-		
-	/* transitions */
-	case SEQ_CROSS:
-	case SEQ_GAMCROSS:
-	case SEQ_WIPE:
-		UI_GetThemeColor3ubv(TH_SEQ_TRANSITION, col);
-
-		/* slightly offset hue to distinguish different effects */
-		if (seq->type == SEQ_CROSS)			rgb_byte_set_hue_float_offset(col,0.04);
-		if (seq->type == SEQ_GAMCROSS)		rgb_byte_set_hue_float_offset(col,0.08);
-		if (seq->type == SEQ_WIPE)			rgb_byte_set_hue_float_offset(col,0.12);
-		break;
-		
-	/* effects */
-	case SEQ_TRANSFORM:
-	case SEQ_SPEED:
-	case SEQ_ADD:
-	case SEQ_SUB:
-	case SEQ_MUL:
-	case SEQ_ALPHAOVER:
-	case SEQ_ALPHAUNDER:
-	case SEQ_OVERDROP:
-	case SEQ_GLOW:
-	case SEQ_MULTICAM:
-	case SEQ_ADJUSTMENT:
-		UI_GetThemeColor3ubv(TH_SEQ_EFFECT, col);
+		case SEQ_META:
+			UI_GetThemeColor3ubv(TH_SEQ_META, col);
+			break;
+
+		case SEQ_MOVIE:
+			UI_GetThemeColor3ubv(TH_SEQ_MOVIE, col);
+			break;
+
+		case SEQ_MOVIECLIP:
+			UI_GetThemeColor3ubv(TH_SEQ_MOVIECLIP, col);
+			break;
 		
-		/* slightly offset hue to distinguish different effects */
-		if (seq->type == SEQ_ADD)			rgb_byte_set_hue_float_offset(col,0.04);
-		if (seq->type == SEQ_SUB)			rgb_byte_set_hue_float_offset(col,0.08);
-		if (seq->type == SEQ_MUL)			rgb_byte_set_hue_float_offset(col,0.12);
-		if (seq->type == SEQ_ALPHAOVER)		rgb_byte_set_hue_float_offset(col,0.16);
-		if (seq->type == SEQ_ALPHAUNDER)	rgb_byte_set_hue_float_offset(col,0.20);
-		if (seq->type == SEQ_OVERDROP)		rgb_byte_set_hue_float_offset(col,0.24);
-		if (seq->type == SEQ_GLOW)			rgb_byte_set_hue_float_offset(col,0.28);
-		if (seq->type == SEQ_TRANSFORM)		rgb_byte_set_hue_float_offset(col,0.36);
-		if (seq->type == SEQ_MULTICAM)		rgb_byte_set_hue_float_offset(col,0.32);
-		if (seq->type == SEQ_ADJUSTMENT)		rgb_byte_set_hue_float_offset(col,0.40);
-		break;
+		case SEQ_SCENE:
+			UI_GetThemeColor3ubv(TH_SEQ_SCENE, col);
 		
-	case SEQ_COLOR:
-		if (colvars->col) {
-			rgb_float_to_uchar(col, colvars->col);
-		}
-		else {
-			col[0] = col[1] = col[2] = 128;
-		}
-		break;
+			if (seq->scene == curscene) {
+				UI_GetColorPtrShade3ubv(col, col, 20);
+			}
+			break;
 		
-	case SEQ_PLUGIN:
-		UI_GetThemeColor3ubv(TH_SEQ_PLUGIN, col);
-		break;
+		/* transitions */
+		case SEQ_CROSS:
+		case SEQ_GAMCROSS:
+		case SEQ_WIPE:
+			UI_GetThemeColor3ubv(TH_SEQ_TRANSITION, col);
+
+			/* slightly offset hue to distinguish different effects */
+			if (seq->type == SEQ_CROSS)    rgb_byte_set_hue_float_offset(col, 0.04);
+			if (seq->type == SEQ_GAMCROSS) rgb_byte_set_hue_float_offset(col, 0.08);
+			if (seq->type == SEQ_WIPE)     rgb_byte_set_hue_float_offset(col, 0.12);
+			break;
+
+		/* effects */
+		case SEQ_TRANSFORM:
+		case SEQ_SPEED:
+		case SEQ_ADD:
+		case SEQ_SUB:
+		case SEQ_MUL:
+		case SEQ_ALPHAOVER:
+		case SEQ_ALPHAUNDER:
+		case SEQ_OVERDROP:
+		case SEQ_GLOW:
+		case SEQ_MULTICAM:
+		case SEQ_ADJUSTMENT:
+			UI_GetThemeColor3ubv(TH_SEQ_EFFECT, col);
+
+			/* slightly offset hue to distinguish different effects */
+			if      (seq->type == SEQ_ADD)        rgb_byte_set_hue_float_offset(col, 0.04);
+			else if (seq->type == SEQ_SUB)        rgb_byte_set_hue_float_offset(col, 0.08);
+			else if (seq->type == SEQ_MUL)        rgb_byte_set_hue_float_offset(col, 0.12);
+			else if (seq->type == SEQ_ALPHAOVER)  rgb_byte_set_hue_float_offset(col, 0.16);
+			else if (seq->type == SEQ_ALPHAUNDER) rgb_byte_set_hue_float_offset(col, 0.20);
+			else if (seq->type == SEQ_OVERDROP)   rgb_byte_set_hue_float_offset(col, 0.24);
+			else if (seq->type == SEQ_GLOW)       rgb_byte_set_hue_float_offset(col, 0.28);
+			else if (seq->type == SEQ_TRANSFORM)  rgb_byte_set_hue_float_offset(col, 0.36);
+			else if (seq->type == SEQ_MULTICAM)   rgb_byte_set_hue_float_offset(col, 0.32);
+			else if (seq->type == SEQ_ADJUSTMENT) rgb_byte_set_hue_float_offset(col, 0.40);
+			break;
+
+		case SEQ_COLOR:
+			if (colvars->col) {
+				rgb_float_to_uchar(col, colvars->col);
+			}
+			else {
+				col[0] = col[1] = col[2] = 128;
+			}
+			break;
 		
-	case SEQ_SOUND:
-		UI_GetThemeColor3ubv(TH_SEQ_AUDIO, col);
-		blendcol[0] = blendcol[1] = blendcol[2] = 128;
-		if (seq->flag & SEQ_MUTE) UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.5, 20);
-		break;
+		case SEQ_PLUGIN:
+			UI_GetThemeColor3ubv(TH_SEQ_PLUGIN, col);
+			break;
+
+		case SEQ_SOUND:
+			UI_GetThemeColor3ubv(TH_SEQ_AUDIO, col);
+			blendcol[0] = blendcol[1] = blendcol[2] = 128;
+			if (seq->flag & SEQ_MUTE) UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.5, 20);
+			break;
 		
-	default:
-		col[0] = 10; col[1] = 255; col[2] = 40;
+		default:
+			col[0] = 10; col[1] = 255; col[2] = 40;
 	}
 }
 
@@ -178,29 +178,29 @@ static void drawseqwave(Scene *scene, Sequence *seq, float x1, float y1, float x
 	 */
 	if (seq->flag & SEQ_AUDIO_DRAW_WAVEFORM) {
 		int i, j, pos;
-		int length = floor((x2-x1)/stepsize)+1;
-		float ymid = (y1+y2)/2;
-		float yscale = (y2-y1)/2;
+		int length = floor((x2 - x1) / stepsize) + 1;
+		float ymid = (y1 + y2) / 2;
+		float yscale = (y2 - y1) / 2;
 		float samplestep;
 		float startsample, endsample;
 		float value;
 
-		SoundWaveform* waveform;
+		SoundWaveform *waveform;
 
 		if (!seq->sound->waveform)
 			sound_read_waveform(seq->sound);
 
 		if (!seq->sound->waveform)
-			return; /* zero length sound */
+			return;  /* zero length sound */
 
 		waveform = seq->sound->waveform;
 
 		if (!waveform)
 			return;
 
-		startsample = floor((seq->startofs + seq->anim_startofs)/FPS * SOUND_WAVE_SAMPLES_PER_SECOND);
-		endsample = ceil((seq->startofs + seq->anim_startofs + seq->enddisp - seq->startdisp)/FPS * SOUND_WAVE_SAMPLES_PER_SECOND);
-		samplestep = (endsample-startsample) * stepsize / (x2-x1);
+		startsample = floor((seq->startofs + seq->anim_startofs) / FPS * SOUND_WAVE_SAMPLES_PER_SECOND);
+		endsample = ceil((seq->startofs + seq->anim_startofs + seq->enddisp - seq->startdisp) / FPS * SOUND_WAVE_SAMPLES_PER_SECOND);
+		samplestep = (endsample - startsample) * stepsize / (x2 - x1);
 
 		if (length > floor((waveform->length - startsample) / samplestep))
 			length = floor((waveform->length - startsample) / samplestep);
@@ -212,13 +212,13 @@ static void drawseqwave(Scene *scene, Sequence *seq, float x1, float y1, float x
 
 			value = waveform->data[pos * 3];
 
-			for (j = pos+1; (j < waveform->length) && (j < pos + samplestep); j++)
+			for (j = pos + 1; (j < waveform->length) && (j < pos + samplestep); j++)
 			{
 				if (value > waveform->data[j * 3])
 					value = waveform->data[j * 3];
 			}
 
-			glVertex2f(x1+i*stepsize, ymid + value * yscale);
+			glVertex2f(x1 + i * stepsize, ymid + value * yscale);
 		}
 		glEnd();
 
@@ -229,13 +229,13 @@ static void drawseqwave(Scene *scene, Sequence *seq, float x1, float y1, float x
 
 			value = waveform->data[pos * 3 + 1];
 
-			for (j = pos+1; (j < waveform->length) && (j < pos + samplestep); j++)
+			for (j = pos + 1; (j < waveform->length) && (j < pos + samplestep); j++)
 			{
 				if (value < waveform->data[j * 3 + 1])
 					value = waveform->data[j * 3 + 1];
 			}
 
-			glVertex2f(x1+i*stepsize, ymid + value * yscale);
+			glVertex2f(x1 + i * stepsize, ymid + value * yscale);
 		}
 		glEnd();
 	}
@@ -265,10 +265,10 @@ static void drawmeta_contents(Scene *scene, Sequence *seqm, float x1, float y1,
 	Sequence *seq;
 	unsigned char col[4];
 
-	int chan_min= MAXSEQ;
-	int chan_max= 0;
-	int chan_range= 0;
-	float draw_range= y2 - y1;
+	int chan_min = MAXSEQ;
+	int chan_max = 0;
+	int chan_range = 0;
+	float draw_range = y2 - y1;
 	float draw_height;
 
 	glEnable(GL_BLEND);
@@ -277,21 +277,21 @@ static void drawmeta_contents(Scene *scene, Sequence *seqm, float x1, float y1,
 	if (seqm->flag & SEQ_MUTE)
 		drawmeta_stipple(1);
 
-	for (seq= seqm->seqbase.first; seq; seq= seq->next) {
-		chan_min= MIN2(chan_min, seq->machine);
-		chan_max= MAX2(chan_max, seq->machine);
+	for (seq = seqm->seqbase.first; seq; seq = seq->next) {
+		chan_min = MIN2(chan_min, seq->machine);
+		chan_max = MAX2(chan_max, seq->machine);
 	}
 
-	chan_range= (chan_max - chan_min) + 1;
-	draw_height= draw_range / chan_range; 
+	chan_range = (chan_max - chan_min) + 1;
+	draw_height = draw_range / chan_range;
 
-	col[3]= 196; /* alpha, used for all meta children */
+	col[3] = 196; /* alpha, used for all meta children */
 
-	for (seq= seqm->seqbase.first; seq; seq= seq->next) {
+	for (seq = seqm->seqbase.first; seq; seq = seq->next) {
 		if ((seq->startdisp > x2 || seq->enddisp < x1) == 0) {
-			float y_chan= (seq->machine - chan_min) / (float)(chan_range) * draw_range;
-			float x1_chan= seq->startdisp;
-			float x2_chan= seq->enddisp;
+			float y_chan = (seq->machine - chan_min) / (float)(chan_range) * draw_range;
+			float x1_chan = seq->startdisp;
+			float x2_chan = seq->enddisp;
 			float y1_chan, y2_chan;
 
 			if ((seqm->flag & SEQ_MUTE) == 0 && (seq->flag & SEQ_MUTE))
@@ -302,11 +302,11 @@ static void drawmeta_contents(Scene *scene, Sequence *seqm, float x1, float y1,
 			glColor4ubv(col);
 			
 			/* clamp within parent sequence strip bounds */
-			if (x1_chan < x1) x1_chan= x1;
-			if (x2_chan > x2) x2_chan= x2;
+			if (x1_chan < x1) x1_chan = x1;
+			if (x2_chan > x2) x2_chan = x2;
 
-			y1_chan= y1 + y_chan + (draw_height * SEQ_STRIP_OFSBOTTOM);
-			y2_chan= y1 + y_chan + (draw_height * SEQ_STRIP_OFSTOP);
+			y1_chan = y1 + y_chan + (draw_height * SEQ_STRIP_OFSBOTTOM);
+			y2_chan = y1 + y_chan + (draw_height * SEQ_STRIP_OFSTOP);
 
 			glRectf(x1_chan,  y1_chan, x2_chan,  y2_chan);
 
@@ -328,51 +328,51 @@ static void drawmeta_contents(Scene *scene, Sequence *seqm, float x1, float y1,
 /* draw a handle, for each end of a sequence strip */
 static void draw_seq_handle(View2D *v2d, Sequence *seq, float pixelx, short direction)
 {
-	float v1[2], v2[2], v3[2], rx1=0, rx2=0; //for triangles and rect
+	float v1[2], v2[2], v3[2], rx1 = 0, rx2 = 0; //for triangles and rect
 	float x1, x2, y1, y2;
 	float handsize;
 	float minhandle, maxhandle;
 	char numstr[32];
-	unsigned int whichsel=0;
+	unsigned int whichsel = 0;
 	
-	x1= seq->startdisp;
-	x2= seq->enddisp;
+	x1 = seq->startdisp;
+	x2 = seq->enddisp;
 	
-	y1= seq->machine+SEQ_STRIP_OFSBOTTOM;
-	y2= seq->machine+SEQ_STRIP_OFSTOP;
+	y1 = seq->machine + SEQ_STRIP_OFSBOTTOM;
+	y2 = seq->machine + SEQ_STRIP_OFSTOP;
 	
 	/* clamp handles to defined size in pixel space */
 	handsize = seq->handsize;
 	minhandle = 7;
 	maxhandle = 40;
-	CLAMP(handsize, minhandle*pixelx, maxhandle*pixelx);
+	CLAMP(handsize, minhandle * pixelx, maxhandle * pixelx);
 	
 	/* set up co-ordinates/dimensions for either left or right handle */
 	if (direction == SEQ_LEFTHANDLE) {	
 		rx1 = x1;
-		rx2 = x1+handsize * 0.75f;
+		rx2 = x1 + handsize * 0.75f;
 		
-		v1[0]= x1+handsize/4; v1[1]= y1+( ((y1+y2)/2.0f - y1)/2);
-		v2[0]= x1+handsize/4; v2[1]= y2-( ((y1+y2)/2.0f - y1)/2);
-		v3[0]= v2[0] + handsize/4; v3[1]= (y1+y2)/2.0f;
+		v1[0] = x1 + handsize / 4; v1[1] = y1 + ( ((y1 + y2) / 2.0f - y1) / 2);
+		v2[0] = x1 + handsize / 4; v2[1] = y2 - ( ((y1 + y2) / 2.0f - y1) / 2);
+		v3[0] = v2[0] + handsize / 4; v3[1] = (y1 + y2) / 2.0f;
 		
 		whichsel = SEQ_LEFTSEL;
 	}
 	else if (direction == SEQ_RIGHTHANDLE) {
-		rx1 = x2-handsize*0.75f;
+		rx1 = x2 - handsize * 0.75f;
 		rx2 = x2;
 		
-		v1[0]= x2-handsize/4; v1[1]= y1+( ((y1+y2)/2.0f - y1)/2);
-		v2[0]= x2-handsize/4; v2[1]= y2-( ((y1+y2)/2.0f - y1)/2);
-		v3[0]= v2[0] - handsize/4; v3[1]= (y1+y2)/2.0f;
+		v1[0] = x2 - handsize / 4; v1[1] = y1 + ( ((y1 + y2) / 2.0f - y1) / 2);
+		v2[0] = x2 - handsize / 4; v2[1] = y2 - ( ((y1 + y2) / 2.0f - y1) / 2);
+		v3[0] = v2[0] - handsize / 4; v3[1] = (y1 + y2) / 2.0f;
 		
 		whichsel = SEQ_RIGHTSEL;
 	}
 	
 	/* draw! */
 	if (seq->type < SEQ_EFFECT || 
-	   get_sequence_effect_num_inputs(seq->type) == 0) {
-		glEnable( GL_BLEND );
+	    get_sequence_effect_num_inputs(seq->type) == 0) {
+		glEnable(GL_BLEND);
 		
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 		
@@ -385,26 +385,26 @@ static void draw_seq_handle(View2D *v2d, Sequence *seq, float pixelx, short dire
 		if (seq->flag & whichsel) glColor4ub(255, 255, 255, 200);
 		else glColor4ub(0, 0, 0, 50);
 		
-		glEnable( GL_POLYGON_SMOOTH );
+		glEnable(GL_POLYGON_SMOOTH);
 		glBegin(GL_TRIANGLES);
 		glVertex2fv(v1); glVertex2fv(v2); glVertex2fv(v3);
 		glEnd();
 		
-		glDisable( GL_POLYGON_SMOOTH );
-		glDisable( GL_BLEND );
+		glDisable(GL_POLYGON_SMOOTH);
+		glDisable(GL_BLEND);
 	}
 	
 	if (G.moving || (seq->flag & whichsel)) {
-		const char col[4]= {255, 255, 255, 255};
+		const char col[4] = {255, 255, 255, 255};
 		if (direction == SEQ_LEFTHANDLE) {
-			BLI_snprintf(numstr, sizeof(numstr),"%d", seq->startdisp);
-			x1= rx1;
+			BLI_snprintf(numstr, sizeof(numstr), "%d", seq->startdisp);
+			x1 = rx1;
 			y1 -= 0.45f;
 		}
 		else {
 			BLI_snprintf(numstr, sizeof(numstr), "%d", seq->enddisp - 1);
-			x1= x2 - handsize*0.75f;
-			y1= y2 + 0.05f;
+			x1 = x2 - handsize * 0.75f;
+			y1 = y2 + 0.05f;
 		}
 		UI_view2d_text_cache_add(v2d, x1, y1, numstr, col);
 	}	
@@ -414,24 +414,24 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq)
 {
 	float x1, x2, y1, y2, pixely, a;
 	unsigned char col[3], blendcol[3];
-	View2D *v2d= &ar->v2d;
+	View2D *v2d = &ar->v2d;
 	
 	if (seq->type >= SEQ_EFFECT) return;
 
-	x1= seq->startdisp;
-	x2= seq->enddisp;
+	x1 = seq->startdisp;
+	x2 = seq->enddisp;
 	
-	y1= seq->machine+SEQ_STRIP_OFSBOTTOM;
-	y2= seq->machine+SEQ_STRIP_OFSTOP;
+	y1 = seq->machine + SEQ_STRIP_OFSBOTTOM;
+	y2 = seq->machine + SEQ_STRIP_OFSTOP;
 
-	pixely = (v2d->cur.ymax - v2d->cur.ymin)/(v2d->mask.ymax - v2d->mask.ymin);
+	pixely = (v2d->cur.ymax - v2d->cur.ymin) / (v2d->mask.ymax - v2d->mask.ymin);
 	
-	if (pixely <= 0) return; /* can happen when the view is split/resized */
+	if (pixely <= 0) return;  /* can happen when the view is split/resized */
 	
 	blendcol[0] = blendcol[1] = blendcol[2] = 120;
 
 	if (seq->startofs) {
-		glEnable( GL_BLEND );
+		glEnable(GL_BLEND);
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 		
 		get_seq_color3ubv(scene, seq, col);
@@ -445,17 +445,17 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq)
 			glColor4ub(col[0], col[1], col[2], 110);
 		}
 		
-		glRectf((float)(seq->start), y1-SEQ_STRIP_OFSBOTTOM, x1, y1);
+		glRectf((float)(seq->start), y1 - SEQ_STRIP_OFSBOTTOM, x1, y1);
 		
 		if (seq->flag & SELECT) glColor4ub(col[0], col[1], col[2], 255);
 		else glColor4ub(col[0], col[1], col[2], 160);
 
-		fdrawbox((float)(seq->start), y1-SEQ_STRIP_OFSBOTTOM, x1, y1);	//outline
+		fdrawbox((float)(seq->start), y1 - SEQ_STRIP_OFSBOTTOM, x1, y1);  //outline
 		
-		glDisable( GL_BLEND );
+		glDisable(GL_BLEND);
 	}
 	if (seq->endofs) {
-		glEnable( GL_BLEND );
+		glEnable(GL_BLEND);
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 		
 		get_seq_color3ubv(scene, seq, col);
@@ -469,14 +469,14 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq)
 			glColor4ub(col[0], col[1], col[2], 110);
 		}
 		
-		glRectf(x2, y2, (float)(seq->start+seq->len), y2+SEQ_STRIP_OFSBOTTOM);
+		glRectf(x2, y2, (float)(seq->start + seq->len), y2 + SEQ_STRIP_OFSBOTTOM);
 		
 		if (seq->flag & SELECT) glColor4ub(col[0], col[1], col[2], 255);
 		else glColor4ub(col[0], col[1], col[2], 160);
 
-		fdrawbox(x2, y2, (float)(seq->start+seq->len), y2+SEQ_STRIP_OFSBOTTOM);	//outline
+		fdrawbox(x2, y2, (float)(seq->start + seq->len), y2 + SEQ_STRIP_OFSBOTTOM); //outline
 		
-		glDisable( GL_BLEND );
+		glDisable(GL_BLEND);
 	}
 	if (seq->startstill) {
 		get_seq_color3ubv(scene, seq, col);
@@ -492,7 +492,7 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq)
 		
 		glColor3ubv((GLubyte *)col);
 		
-		for (a=y1; a< y2; a+= pixely * 2.0f) {
+		for (a = y1; a < y2; a += pixely * 2.0f) {
 			fdrawline(x1,  a,  (float)(seq->start),  a);
 		}
 	}
@@ -501,7 +501,7 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq)
 		UI_GetColorPtrBlendShade3ubv(col, blendcol, col, 0.75, 40);
 		glColor3ubv((GLubyte *)col);
 		
-		draw_shadedstrip(seq, col, (float)(seq->start+seq->len), y1, x2, y2);
+		draw_shadedstrip(seq, col, (float)(seq->start + seq->len), y1, x2, y2);
 		
 		/* feint pinstripes, helps see exactly which is extended and which isn't,
 		 * especially when the extension is very small */ 
@@ -510,8 +510,8 @@ static void draw_seq_extensions(Scene *scene, ARegion *ar, Sequence *seq)
 		
 		glColor3ubv((GLubyte *)col);
 		
-		for (a=y1; a< y2; a+= pixely * 2.0f) {
-			fdrawline((float)(seq->start+seq->len),  a,  x2,  a);
+		for (a = y1; a < y2; a += pixely * 2.0f) {
+			fdrawline((float)(seq->start + seq->len),  a,  x2,  a);
 		}
 	}
 }
@@ -521,12 +521,12 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float
 {
 	rctf rect;
 	char str[32 + FILE_MAX];
-	const char *name= seq->name+2;
+	const char *name = seq->name + 2;
 	char col[4];
 
 	/* note, all strings should include 'name' */
-	if (name[0]=='\0')
-		name= give_seqname(seq);
+	if (name[0] == '\0')
+		name = give_seqname(seq);
 
 	if (seq->type == SEQ_META || seq->type == SEQ_ADJUSTMENT) {
 		BLI_snprintf(str, sizeof(str), "%d | %s", seq->len, name);
@@ -534,61 +534,78 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float
 	else if (seq->type == SEQ_SCENE) {
 		if (seq->scene) {
 			if (seq->scene_camera) {
-				BLI_snprintf(str, sizeof(str), "%d | %s: %s (%s)", seq->len, name, seq->scene->id.name+2, ((ID *)seq->scene_camera)->name+2);
+				BLI_snprintf(str, sizeof(str), "%d | %s: %s (%s)",
+				             seq->len, name, seq->scene->id.name + 2, ((ID *)seq->scene_camera)->name + 2);
 			}
 			else {
-				BLI_snprintf(str, sizeof(str), "%d | %s: %s", seq->len, name, seq->scene->id.name+2);
+				BLI_snprintf(str, sizeof(str), "%d | %s: %s",
+				             seq->len, name, seq->scene->id.name + 2);
 			}
 		}
 		else {
-			BLI_snprintf(str, sizeof(str), "%d | %s", seq->len, name);
+			BLI_snprintf(str, sizeof(str), "%d | %s",
+			             seq->len, name);
 		}
 	}
 	else if (seq->type == SEQ_MOVIECLIP) {
-		if (seq->clip && strcmp(name, seq->clip->id.name+2) != 0) {
-			BLI_snprintf(str, sizeof(str), "%d | %s: %s", seq->len, name, seq->clip->id.name+2);
+		if (seq->clip && strcmp(name, seq->clip->id.name + 2) != 0) {
+			BLI_snprintf(str, sizeof(str), "%d | %s: %s",
+			             seq->len, name, seq->clip->id.name + 2);
 		}
 		else {
-			BLI_snprintf(str, sizeof(str), "%d | %s", seq->len, name);
+			BLI_snprintf(str, sizeof(str), "%d | %s",
+			             seq->len, name);
 		}
 	}
 	else if (seq->type == SEQ_MULTICAM) {
-		BLI_snprintf(str, sizeof(str), "Cam | %s: %d", name, seq->multicam_source);
+		BLI_snprintf(str, sizeof(str), "Cam | %s: %d",
+		             name, seq->multicam_source);
 	}
 	else if (seq->type == SEQ_IMAGE) {
-		BLI_snprintf(str, sizeof(str), "%d | %s: %s%s", seq->len, name, seq->strip->dir, seq->strip->stripdata->name);
+		BLI_snprintf(str, sizeof(str), "%d | %s: %s%s",
+		             seq->len, name, seq->strip->dir, seq->strip->stripdata->name);
 	}
 	else if (seq->type & SEQ_EFFECT) {
-		int can_float = (seq->type != SEQ_PLUGIN)
-			|| (seq->plugin && seq->plugin->version >= 4);
+		int can_float = (seq->type != SEQ_PLUGIN) || (seq->plugin && seq->plugin->version >= 4);
 
-		if (seq->seq3!=seq->seq2 && seq->seq1!=seq->seq3)
-			BLI_snprintf(str, sizeof(str), "%d | %s: %d>%d (use %d)%s", seq->len, name, seq->seq1->machine, seq->seq2->machine, seq->seq3->machine, can_float ? "" : " No float, upgrade plugin!");
-		else if (seq->seq1 && seq->seq2)
-			BLI_snprintf(str, sizeof(str), "%d | %s: %d>%d%s", seq->len, name, seq->seq1->machine, seq->seq2->machine, can_float ? "" : " No float, upgrade plugin!");
-		else
-			BLI_snprintf(str, sizeof(str), "%d | %s", seq->len, name);
+		if (seq->seq3 != seq->seq2 && seq->seq1 != seq->seq3) {
+			BLI_snprintf(str, sizeof(str), "%d | %s: %d>%d (use %d)%s",
+			             seq->len, name, seq->seq1->machine, seq->seq2->machine, seq->seq3->machine,
+			             can_float ? "" : " No float, upgrade plugin!");
+		}
+		else if (seq->seq1 && seq->seq2) {
+			BLI_snprintf(str, sizeof(str), "%d | %s: %d>%d%s",
+			             seq->len, name, seq->seq1->machine, seq->seq2->machine,
+			             can_float ? "" : " No float, upgrade plugin!");
+		}
+		else {
+			BLI_snprintf(str, sizeof(str), "%d | %s",
+			             seq->len, name);
+		}
 	}
 	else if (seq->type == SEQ_SOUND) {
 		if (seq->sound)
-			BLI_snprintf(str, sizeof(str), "%d | %s: %s", seq->len, name, seq->sound->name);
+			BLI_snprintf(str, sizeof(str), "%d | %s: %s",
+			             seq->len, name, seq->sound->name);
 		else
-			BLI_snprintf(str, sizeof(str), "%d | %s", seq->len, name);
+			BLI_snprintf(str, sizeof(str), "%d | %s",
+			             seq->len, name);
 	}
 	else if (seq->type == SEQ_MOVIE) {
-		BLI_snprintf(str, sizeof(str), "%d | %s: %s%s", seq->len, name, seq->strip->dir, seq->strip->stripdata->name);
+		BLI_snprintf(str, sizeof(str), "%d | %s: %s%s",
+		             seq->len, name, seq->strip->dir, seq->strip->stripdata->name);
 	}
 	
 	if (seq->flag & SELECT) {
-		col[0]= col[1]= col[2]= 255;
+		col[0] = col[1] = col[2] = 255;
 	}
 	else if ((((int)background_col[0] + (int)background_col[1] + (int)background_col[2]) / 3) < 50) {
-		col[0]= col[1]= col[2]= 80; /* use lighter text color for dark background */
+		col[0] = col[1] = col[2] = 80; /* use lighter text color for dark background */
 	}
 	else {
-		col[0]= col[1]= col[2]= 0;
+		col[0] = col[1] = col[2] = 0;
 	}
-	col[3]= 255;
+	col[3] = 255;
 
 	rect.xmin = x1;
 	rect.ymin = y1;
@@ -607,29 +624,29 @@ static void draw_shadedstrip(Sequence *seq, unsigned char col[3], float x1, floa
 		glPolygonStipple(stipple_halftone);
 	}
 	
-	ymid1 = (y2-y1)*0.25f + y1;
-	ymid2 = (y2-y1)*0.65f + y1;
+	ymid1 = (y2 - y1) * 0.25f + y1;
+	ymid2 = (y2 - y1) * 0.65f + y1;
 	
 	glShadeModel(GL_SMOOTH);
 	glBegin(GL_QUADS);
 	
-	if (seq->flag & SEQ_INVALID_EFFECT) { col[0]= 255; col[1]= 0; col[2]= 255; }
+	if (seq->flag & SEQ_INVALID_EFFECT) { col[0] = 255; col[1] = 0; col[2] = 255; }
 	else if (seq->flag & SELECT) UI_GetColorPtrShade3ubv(col, col, -50);
 	/* else UI_GetColorPtrShade3ubv(col, col, 0); */ /* DO NOTHING */
 	
 	glColor3ubv(col);
 	
-	glVertex2f(x1,y1);
-	glVertex2f(x2,y1);
+	glVertex2f(x1, y1);
+	glVertex2f(x2, y1);
 
-	if (seq->flag & SEQ_INVALID_EFFECT) { col[0]= 255; col[1]= 0; col[2]= 255; }
+	if (seq->flag & SEQ_INVALID_EFFECT) { col[0] = 255; col[1] = 0; col[2] = 255; }
 	else if (seq->flag & SELECT) UI_GetColorPtrBlendShade3ubv(col, col, col, 0.0, 5);
 	else UI_GetColorPtrShade3ubv(col, col, -5);
 
 	glColor3ubv((GLubyte *)col);
 	
-	glVertex2f(x2,ymid1);
-	glVertex2f(x1,ymid1);
+	glVertex2f(x2, ymid1);
+	glVertex2f(x1, ymid1);
 	
 	glEnd();
 	
@@ -637,16 +654,16 @@ static void draw_shadedstrip(Sequence *seq, unsigned char col[3], float x1, floa
 	
 	glBegin(GL_QUADS);
 	
-	glVertex2f(x1,ymid2);
-	glVertex2f(x2,ymid2);
+	glVertex2f(x1, ymid2);
+	glVertex2f(x2, ymid2);
 	
 	if (seq->flag & SELECT) UI_GetColorPtrShade3ubv(col, col, -15);
 	else UI_GetColorPtrShade3ubv(col, col, 25);
 	
 	glColor3ubv((GLubyte *)col);
 	
-	glVertex2f(x2,y2);
-	glVertex2f(x1,y2);
+	glVertex2f(x2, y2);
+	glVertex2f(x1, y2);
 	
 	glEnd();
 	
@@ -662,7 +679,7 @@ static void draw_shadedstrip(Sequence *seq, unsigned char col[3], float x1, floa
  */
 static void draw_seq_strip(Scene *scene, ARegion *ar, Sequence *seq, int outline_tint, float pixelx)
 {
-	View2D *v2d= &ar->v2d;
+	View2D *v2d = &ar->v2d;
 	float x1, x2, y1, y2;
 	unsigned char col[3], background_col[3], is_single_image;
 
@@ -670,23 +687,23 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, Sequence *seq, int outline
 	is_single_image = (char)seq_single_check(seq);
 	
 	/* body */
-	if (seq->startstill) x1= seq->start;
-	else x1= seq->startdisp;
-	y1= seq->machine+SEQ_STRIP_OFSBOTTOM;
-	if (seq->endstill) x2= seq->start+seq->len;
-	else x2= seq->enddisp;
-	y2= seq->machine+SEQ_STRIP_OFSTOP;
-	
-	
+	x1 = (seq->startstill) ? seq->start : seq->startdisp;
+	y1 = seq->machine + SEQ_STRIP_OFSBOTTOM;
+	x2 = (seq->endstill) ? (seq->start + seq->len) : seq->enddisp;
+	y2 = seq->machine + SEQ_STRIP_OFSTOP;
+
+
 	/* get the correct color per strip type*/
 	//get_seq_color3ubv(scene, seq, col);
 	get_seq_color3ubv(scene, seq, background_col);
 	
 	/* draw the main strip body */
-	if (is_single_image) /* single image */
+	if (is_single_image) {  /* single image */
 		draw_shadedstrip(seq, background_col, seq_tx_get_final_left(seq, 0), y1, seq_tx_get_final_right(seq, 0), y2);
-	else /* normal operation */
+	}
+	else {  /* normal operation */
 		draw_shadedstrip(seq, background_col, x1, y1, x2, y2);
+	}
 	
 	/* draw additional info and controls */
 	if (!is_single_image)
@@ -696,11 +713,13 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, Sequence *seq, int outline
 	draw_seq_handle(v2d, seq, pixelx, SEQ_RIGHTHANDLE);
 	
 	/* draw the strip outline */
-	x1= seq->startdisp;
-	x2= seq->enddisp;
+	x1 = seq->startdisp;
+	x2 = seq->enddisp;
 	
 	/* draw sound wave */
-	if (seq->type == SEQ_SOUND) drawseqwave(scene, seq, x1, y1, x2, y2, (ar->v2d.cur.xmax - ar->v2d.cur.xmin)/ar->winx);
+	if (seq->type == SEQ_SOUND) {
+		drawseqwave(scene, seq, x1, y1, x2, y2, (ar->v2d.cur.xmax - ar->v2d.cur.xmin) / ar->winx);
+	}
 
 	/* draw lock */
 	if (seq->flag & SEQ_LOCK) {
@@ -724,10 +743,10 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, Sequence *seq, int outline
 	get_seq_color3ubv(scene, seq, col);
 	if (G.moving && (seq->flag & SELECT)) {
 		if (seq->flag & SEQ_OVERLAP) {
-			col[0]= 255; col[1]= col[2]= 40;
+			col[0] = 255; col[1] = col[2] = 40;
 		}
 		else
-			UI_GetColorPtrShade3ubv(col, col, 120+outline_tint);
+			UI_GetColorPtrShade3ubv(col, col, 120 + outline_tint);
 	}
 	else
 		UI_GetColorPtrShade3ubv(col, col, outline_tint);
@@ -745,27 +764,29 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, Sequence *seq, int outline
 		glDisable(GL_LINE_STIPPLE);
 	}
 	
-	if (seq->type==SEQ_META) drawmeta_contents(scene, seq, x1, y1, x2, y2);
+	if (seq->type == SEQ_META) {
+		drawmeta_contents(scene, seq, x1, y1, x2, y2);
+	}
 	
 	/* calculate if seq is long enough to print a name */
-	x1= seq->startdisp+seq->handsize;
-	x2= seq->enddisp-seq->handsize;
+	x1 = seq->startdisp + seq->handsize;
+	x2 = seq->enddisp - seq->handsize;
 
 	/* info text on the strip */
-	if (x1<v2d->cur.xmin) x1= v2d->cur.xmin;
-	else if (x1>v2d->cur.xmax) x1= v2d->cur.xmax;
-	if (x2<v2d->cur.xmin) x2= v2d->cur.xmin;
-	else if (x2>v2d->cur.xmax) x2= v2d->cur.xmax;
+	if (x1 < v2d->cur.xmin) x1 = v2d->cur.xmin;
+	else if (x1 > v2d->cur.xmax) x1 = v2d->cur.xmax;
+	if (x2 < v2d->cur.xmin) x2 = v2d->cur.xmin;
+	else if (x2 > v2d->cur.xmax) x2 = v2d->cur.xmax;
 
 	/* nice text here would require changing the view matrix for texture text */
-	if ( (x2-x1) / pixelx > 32) {
+	if ((x2 - x1) / pixelx > 32) {
 		draw_seq_text(v2d, seq, x1, x2, y1, y2, background_col);
 	}
 }
 
-static Sequence *special_seq_update= NULL;
+static Sequence *special_seq_update = NULL;
 
-static void UNUSED_FUNCTION(set_special_seq_update)(int val)
+static void UNUSED_FUNCTION(set_special_seq_update) (int val)
 {
 //	int x;
 
@@ -773,14 +794,14 @@ static void UNUSED_FUNCTION(set_special_seq_update)(int val)
 	if (val) {
 // XXX		special_seq_update= find_nearest_seq(&x);
 	}
-	else special_seq_update= NULL;
+	else special_seq_update = NULL;
 }
 
-void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq, int cfra, int frame_ofs)
+void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq, int cfra, int frame_ofs)
 {
-	struct Main *bmain= CTX_data_main(C);
-	struct ImBuf *ibuf= NULL;
-	struct ImBuf *scope= NULL;
+	struct Main *bmain = CTX_data_main(C);
+	struct ImBuf *ibuf = NULL;
+	struct ImBuf *scope = NULL;
 	struct View2D *v2d = &ar->v2d;
 	int rectx, recty;
 	float viewrectx, viewrecty;
@@ -802,8 +823,8 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 		return;
 	}
 
-	viewrectx = (render_size*(float)scene->r.xsch)/100.0f;
-	viewrecty = (render_size*(float)scene->r.ysch)/100.0f;
+	viewrectx = (render_size * (float)scene->r.xsch) / 100.0f;
+	viewrecty = (render_size * (float)scene->r.ysch) / 100.0f;
 
 	rectx = viewrectx + 0.5f;
 	recty = viewrecty + 0.5f;
@@ -833,38 +854,38 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 	context = seq_new_render_data(bmain, scene, rectx, recty, proxy_size);
 
 	if (special_seq_update)
-		ibuf= give_ibuf_seq_direct(context, cfra + frame_ofs, special_seq_update);
+		ibuf = give_ibuf_seq_direct(context, cfra + frame_ofs, special_seq_update);
 	else if (!U.prefetchframes) // XXX || (G.f & G_PLAYANIM) == 0) {
-		ibuf= (ImBuf *)give_ibuf_seq(context, cfra + frame_ofs, sseq->chanshown);
+		ibuf = give_ibuf_seq(context, cfra + frame_ofs, sseq->chanshown);
 	else
-		ibuf= (ImBuf *)give_ibuf_seq_threaded(context, cfra + frame_ofs, sseq->chanshown);
+		ibuf = give_ibuf_seq_threaded(context, cfra + frame_ofs, sseq->chanshown);
 	
-	if (ibuf==NULL) 
+	if (ibuf == NULL)
 		return;
 
-	if (ibuf->rect==NULL && ibuf->rect_float == NULL) 
+	if (ibuf->rect == NULL && ibuf->rect_float == NULL)
 		return;
 	
-	switch(sseq->mainb) {
-	case SEQ_DRAW_IMG_IMBUF:
-		if (sseq->zebra != 0) {
-			scope = make_zebra_view_from_ibuf(ibuf, sseq->zebra);
-		}
-		break;
-	case SEQ_DRAW_IMG_WAVEFORM:
-		if ((sseq->flag & SEQ_DRAW_COLOR_SEPARATED) != 0) {
-			scope = make_sep_waveform_view_from_ibuf(ibuf);
-		}
-		else {
-			scope = make_waveform_view_from_ibuf(ibuf);
-		}
-		break;
-	case SEQ_DRAW_IMG_VECTORSCOPE:
-		scope = make_vectorscope_view_from_ibuf(ibuf);
-		break;
-	case SEQ_DRAW_IMG_HISTOGRAM:
-		scope = make_histogram_view_from_ibuf(ibuf);
-		break;
+	switch (sseq->mainb) {
+		case SEQ_DRAW_IMG_IMBUF:
+			if (sseq->zebra != 0) {
+				scope = make_zebra_view_from_ibuf(ibuf, sseq->zebra);
+			}
+			break;
+		case SEQ_DRAW_IMG_WAVEFORM:
+			if ((sseq->flag & SEQ_DRAW_COLOR_SEPARATED) != 0) {
+				scope = make_sep_waveform_view_from_ibuf(ibuf);
+			}
+			else {
+				scope = make_waveform_view_from_ibuf(ibuf);
+			}
+			break;
+		case SEQ_DRAW_IMG_VECTORSCOPE:
+			scope = make_vectorscope_view_from_ibuf(ibuf);
+			break;
+		case SEQ_DRAW_IMG_HISTOGRAM:
+			scope = make_histogram_view_from_ibuf(ibuf);
+			break;
 	}
 
 	if (scope) {
@@ -872,14 +893,14 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 		ibuf = scope;
 	}
 
-	if (ibuf->rect_float && ibuf->rect==NULL) {
+	if (ibuf->rect_float && ibuf->rect == NULL) {
 		IMB_rect_from_float(ibuf);	
 	}
 	
 	/* setting up the view - actual drawing starts here */
 	UI_view2d_view_ortho(v2d);
 
-	last_texid= glaGetOneInteger(GL_TEXTURE_2D);
+	last_texid = glaGetOneInteger(GL_TEXTURE_2D);
 	glEnable(GL_TEXTURE_2D);
 	glGenTextures(1, (GLuint *)&texid);
 
@@ -898,16 +919,16 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 		tot_clip.xmax = v2d->tot.xmin + (ABS(v2d->tot.xmax - v2d->tot.xmin) * scene->ed->over_border.xmax);
 		tot_clip.ymax = v2d->tot.ymin + (ABS(v2d->tot.ymax - v2d->tot.ymin) * scene->ed->over_border.ymax);
 
-		glTexCoord2f(scene->ed->over_border.xmin, scene->ed->over_border.ymin);glVertex2f(tot_clip.xmin, tot_clip.ymin);
-		glTexCoord2f(scene->ed->over_border.xmin, scene->ed->over_border.ymax);glVertex2f(tot_clip.xmin, tot_clip.ymax);
-		glTexCoord2f(scene->ed->over_border.xmax, scene->ed->over_border.ymax);glVertex2f(tot_clip.xmax, tot_clip.ymax);
-		glTexCoord2f(scene->ed->over_border.xmax, scene->ed->over_border.ymin);glVertex2f(tot_clip.xmax, tot_clip.ymin);
+		glTexCoord2f(scene->ed->over_border.xmin, scene->ed->over_border.ymin); glVertex2f(tot_clip.xmin, tot_clip.ymin);
+		glTexCoord2f(scene->ed->over_border.xmin, scene->ed->over_border.ymax); glVertex2f(tot_clip.xmin, tot_clip.ymax);
+		glTexCoord2f(scene->ed->over_border.xmax, scene->ed->over_border.ymax); glVertex2f(tot_clip.xmax, tot_clip.ymax);
+		glTexCoord2f(scene->ed->over_border.xmax, scene->ed->over_border.ymin); glVertex2f(tot_clip.xmax, tot_clip.ymin);
 	}
 	else {
-		glTexCoord2f(0.0f, 0.0f);glVertex2f(v2d->tot.xmin, v2d->tot.ymin);
-		glTexCoord2f(0.0f, 1.0f);glVertex2f(v2d->tot.xmin, v2d->tot.ymax);
-		glTexCoord2f(1.0f, 1.0f);glVertex2f(v2d->tot.xmax, v2d->tot.ymax);
-		glTexCoord2f(1.0f, 0.0f);glVertex2f(v2d->tot.xmax, v2d->tot.ymin);
+		glTexCoord2f(0.0f, 0.0f); glVertex2f(v2d->tot.xmin, v2d->tot.ymin);
+		glTexCoord2f(0.0f, 1.0f); glVertex2f(v2d->tot.xmin, v2d->tot.ymax);
+		glTexCoord2f(1.0f, 1.0f); glVertex2f(v2d->tot.xmax, v2d->tot.ymax);
+		glTexCoord2f(1.0f, 0.0f); glVertex2f(v2d->tot.xmax, v2d->tot.ymin);
 	}
 	glEnd( );
 	glBindTexture(GL_TEXTURE_2D, last_texid);
@@ -927,23 +948,23 @@ void draw_image_seq(const bContext* C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 		UI_ThemeColorBlendShade(TH_WIRE, TH_BACK, 1.0, 0);
 
 		glBegin(GL_LINE_LOOP);
-		glVertex2f(x1-0.5f, y1-0.5f);
-		glVertex2f(x1-0.5f, y2+0.5f);
-		glVertex2f(x2+0.5f, y2+0.5f);
-		glVertex2f(x2+0.5f, y1-0.5f);
+		glVertex2f(x1 - 0.5f, y1 - 0.5f);
+		glVertex2f(x1 - 0.5f, y2 + 0.5f);
+		glVertex2f(x2 + 0.5f, y2 + 0.5f);
+		glVertex2f(x2 + 0.5f, y1 - 0.5f);
 		glEnd();
 
 		/* safety border */
 		if ((sseq->flag & SEQ_DRAW_SAFE_MARGINS) != 0) {
-			float fac= 0.1;
+			float fac = 0.1;
 
-			float a= fac*(x2-x1);
-			x1+= a;
-			x2-= a;
+			float a = fac * (x2 - x1);
+			x1 += a;
+			x2 -= a;
 
-			a= fac*(y2-y1);
-			y1+= a;
-			y2-= a;
+			a = fac * (y2 - y1);
+			y1 += a;
+			y2 -= a;
 
 			glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
@@ -987,13 +1008,13 @@ void drawprefetchseqspace(Scene *scene, ARegion *UNUSED(ar), SpaceSeq *sseq)
 		return;
 	}
 
-	rectx= (render_size*scene->r.xsch)/100;
-	recty= (render_size*scene->r.ysch)/100;
+	rectx = (render_size * scene->r.xsch) / 100;
+	recty = (render_size * scene->r.ysch) / 100;
 
 	if (sseq->mainb != SEQ_DRAW_SEQUENCE) {
 		give_ibuf_prefetch_request(
-			rectx, recty, (scene->r.cfra), sseq->chanshown,
-			proxy_size);
+		    rectx, recty, (scene->r.cfra), sseq->chanshown,
+		    proxy_size);
 	}
 }
 #endif
@@ -1008,60 +1029,60 @@ static void draw_seq_backdrop(View2D *v2d)
 	glRectf(v2d->cur.xmin,  -1.0,  v2d->cur.xmax,  1.0);
 
 	/* Alternating horizontal stripes */
-	i= MAX2(1, ((int)v2d->cur.ymin)-1);
+	i = MAX2(1, ((int)v2d->cur.ymin) - 1);
 
 	glBegin(GL_QUADS);
-		while (i<v2d->cur.ymax) {
-			if (((int)i) & 1)
-				UI_ThemeColorShade(TH_BACK, -15);
-			else
-				UI_ThemeColorShade(TH_BACK, -25);
-			
-			glVertex2f(v2d->cur.xmax, i);
-			glVertex2f(v2d->cur.xmin, i);
-			glVertex2f(v2d->cur.xmin, i+1);
-			glVertex2f(v2d->cur.xmax, i+1);
+	while (i < v2d->cur.ymax) {
+		if (((int)i) & 1)
+			UI_ThemeColorShade(TH_BACK, -15);
+		else
+			UI_ThemeColorShade(TH_BACK, -25);
 			
-			i+=1.0;
-		}
+		glVertex2f(v2d->cur.xmax, i);
+		glVertex2f(v2d->cur.xmin, i);
+		glVertex2f(v2d->cur.xmin, i + 1);
+		glVertex2f(v2d->cur.xmax, i + 1);
+
+		i += 1.0;
+	}
 	glEnd();
 	
 	/* Darker lines separating the horizontal bands */
-	i= MAX2(1, ((int)v2d->cur.ymin)-1);
+	i = MAX2(1, ((int)v2d->cur.ymin) - 1);
 	UI_ThemeColor(TH_GRID);
 	
 	glBegin(GL_LINES);
-		while (i < v2d->cur.ymax) {
-			glVertex2f(v2d->cur.xmax, i);
-			glVertex2f(v2d->cur.xmin, i);
+	while (i < v2d->cur.ymax) {
+		glVertex2f(v2d->cur.xmax, i);
+		glVertex2f(v2d->cur.xmin, i);
 			
-			i+=1.0;
-		}
+		i += 1.0;
+	}
 	glEnd();
 }
 
 /* draw the contents of the sequencer strips view */
 static void draw_seq_strips(const bContext *C, Editing *ed, ARegion *ar)
 {
-	Scene *scene= CTX_data_scene(C);
-	View2D *v2d= &ar->v2d;
+	Scene *scene = CTX_data_scene(C);
+	View2D *v2d = &ar->v2d;
 	Sequence *last_seq = seq_active_get(scene);
 	int sel = 0, j;
-	float pixelx = (v2d->cur.xmax - v2d->cur.xmin)/(v2d->mask.xmax - v2d->mask.xmin);
+	float pixelx = (v2d->cur.xmax - v2d->cur.xmin) / (v2d->mask.xmax - v2d->mask.xmin);
 	
 	/* loop through twice, first unselected, then selected */
-	for (j=0; j<2; j++) {
+	for (j = 0; j < 2; j++) {
 		Sequence *seq;
-		int outline_tint= (j) ? -60 : -150; /* highlighting around strip edges indicating selection */
+		int outline_tint = (j) ? -60 : -150; /* highlighting around strip edges indicating selection */
 		
 		/* loop through strips, checking for those that are visible */
-		for (seq= ed->seqbasep->first; seq; seq= seq->next) {
+		for (seq = ed->seqbasep->first; seq; seq = seq->next) {
 			/* boundbox and selection tests for NOT drawing the strip... */
 			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;
-			else if (seq->machine+1.0f < v2d->cur.ymin) continue;
+			else if (MAX2(seq->enddisp, seq->start + seq->len) < v2d->cur.xmin) continue;
+			else if (seq->machine + 1.0f < v2d->cur.ymin) continue;
 			else if (seq->machine > v2d->cur.ymax) continue;
 			
 			/* strip passed all tests unscathed... so draw it now */
@@ -1069,7 +1090,7 @@ static void draw_seq_strips(const bContext *C, Editing *ed, ARegion *ar)
 		}
 		
 		/* draw selected next time round */
-		sel= SELECT; 
+		sel = SELECT;
 	}
 	
 	/* draw the last selected last (i.e. 'active' in other parts of Blender), removes some overlapping error */
@@ -1104,18 +1125,18 @@ static void seq_draw_sfra_efra(Scene *scene, View2D *v2d)
 /* Draw Timeline/Strip Editor Mode for Sequencer */
 void draw_timeline_seq(const bContext *C, ARegion *ar)
 {
-	Scene *scene= CTX_data_scene(C);
-	Editing *ed= seq_give_editing(scene, FALSE);
-	SpaceSeq *sseq= CTX_wm_space_seq(C);
-	View2D *v2d= &ar->v2d;
+	Scene *scene = CTX_data_scene(C);
+	Editing *ed = seq_give_editing(scene, FALSE);
+	SpaceSeq *sseq = CTX_wm_space_seq(C);
+	View2D *v2d = &ar->v2d;
 	View2DScrollers *scrollers;
-	short unit=0, flag=0;
+	short unit = 0, flag = 0;
 	float col[3];
 	
 	/* clear and setup matrix */
 	UI_GetThemeColor3fv(TH_BACK, col);
 	if (ed && ed->metastack.first) 
-		glClearColor(col[0], col[1], col[2]-0.1f, 0.0f);
+		glClearColor(col[0], col[1], col[2] - 0.1f, 0.0f);
 	else 
 		glClearColor(col[0], col[1], col[2], 0.0f);
 	glClear(GL_COLOR_BUFFER_BIT);
@@ -1136,7 +1157,7 @@ void draw_timeline_seq(const bContext *C, ARegion *ar)
 	// NOTE: the gridlines are currently spaced every 25 frames, which is only fine for 25 fps, but maybe not for 30...
 	UI_view2d_constant_grid_draw(v2d);
 	
-	seq_draw_sfra_efra(scene, v2d);	
+	seq_draw_sfra_efra(scene, v2d);
 
 	/* sequence strips (if there is data available to be drawn) */
 	if (ed) {
@@ -1149,8 +1170,8 @@ void draw_timeline_seq(const bContext *C, ARegion *ar)
 	
 	/* current frame */
 	UI_view2d_view_ortho(v2d);
-	if ((sseq->flag & SEQ_DRAWFRAMES)==0) 	flag |= DRAWCFRA_UNIT_SECONDS;
-	if ((sseq->flag & SEQ_NO_DRAW_CFRANUM)==0)  flag |= DRAWCFRA_SHOW_NUMBOX;
+	if ((sseq->flag & SEQ_DRAWFRAMES) == 0)      flag |= DRAWCFRA_UNIT_SECONDS;
+	if ((sseq->flag & SEQ_NO_DRAW_CFRANUM) == 0) flag |= DRAWCFRA_SHOW_NUMBOX;
 	ANIM_draw_cfra(C, v2d, flag);
 	
 	/* markers */
@@ -1163,13 +1184,13 @@ void draw_timeline_seq(const bContext *C, ARegion *ar)
 
 	/* overlap playhead */
 	if (scene->ed && scene->ed->over_flag & SEQ_EDIT_OVERLAY_SHOW) {
-		int cfra_over= (scene->ed->over_flag & SEQ_EDIT_OVERLAY_ABS) ? scene->ed->over_cfra : scene->r.cfra + scene->ed->over_ofs;
+		int cfra_over = (scene->ed->over_flag & SEQ_EDIT_OVERLAY_ABS) ? scene->ed->over_cfra : scene->r.cfra + scene->ed->over_ofs;
 		glColor3f(0.2, 0.2, 0.2);
 		// glRectf(cfra_over, v2d->cur.ymin, scene->ed->over_ofs + scene->r.cfra + 1, v2d->cur.ymax);
 
 		glBegin(GL_LINES);
-			glVertex2f(cfra_over, v2d->cur.ymin);
-			glVertex2f(cfra_over, v2d->cur.ymax);
+		glVertex2f(cfra_over, v2d->cur.ymin);
+		glVertex2f(cfra_over, v2d->cur.ymax);
 		glEnd();
 
 	}
@@ -1178,8 +1199,8 @@ void draw_timeline_seq(const bContext *C, ARegion *ar)
 	UI_view2d_view_restore(C);
 
 	/* scrollers */
-	unit= (sseq->flag & SEQ_DRAWFRAMES)? V2D_UNIT_FRAMES : V2D_UNIT_SECONDSSEQ;
-	scrollers= UI_view2d_scrollers_calc(C, v2d, unit, V2D_GRID_CLAMP, V2D_UNIT_VALUES, V2D_GRID_CLAMP);
+	unit = (sseq->flag & SEQ_DRAWFRAMES) ? V2D_UNIT_FRAMES : V2D_UNIT_SECONDSSEQ;
+	scrollers = UI_view2d_scrollers_calc(C, v2d, unit, V2D_GRID_CLAMP, V2D_UNIT_VALUES, V2D_GRID_CLAMP);
 	UI_view2d_scrollers_draw(C, v2d, scrollers);
 	UI_view2d_scrollers_free(scrollers);
 }