[Bf-blender-cvs] [f5c2b1c] terrible_consequencer: Merge branch 'master' into terrible_consequencer

[Antony Riakiotakis]

Commit: f5c2b1c2f6aece95c0c8d6348840197fa0809955
Author: Antony Riakiotakis
Date:   Fri Nov 14 15:07:10 2014 +0100
Branches: terrible_consequencer
https://developer.blender.org/rBf5c2b1c2f6aece95c0c8d6348840197fa0809955

Merge branch 'master' into terrible_consequencer

Conflicts:
	source/blender/editors/space_sequencer/sequencer_draw.c

===================================================================



===================================================================

diff --cc source/blender/editors/space_sequencer/sequencer_draw.c
index 1fff132,9fbca7b..30554e6
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@@ -86,8 -82,13 +86,11 @@@
  
  /* Note, Don't use SEQ_BEGIN/SEQ_END while drawing!
   * it messes up transform, - Campbell */
+ #undef SEQ_BEGIN
+ #undef SEQP_BEGIN
+ #undef SEQ_END
  
 -static void draw_shadedstrip(Sequence *seq, unsigned char col[3], float x1, float y1, float x2, float y2);
 -
 -static void get_seq_color3ubv(Scene *curscene, Sequence *seq, unsigned char col[3])
 +void get_seq_color3ubv(Scene *curscene, Sequence *seq, unsigned char col[3])
  {
  	unsigned char blendcol[3];
  	SolidColorVars *colvars = (SolidColorVars *)seq->effectdata;
@@@ -811,9 -788,7 +814,9 @@@ static void draw_seq_strip(const bConte
  		glLineStipple(1, 0x8888);
  	}
  	
 -	UI_draw_roundbox_shade_x(GL_LINE_LOOP, x1, y1, x2, y2, 0.0, 0.1, 0.0);
 +	glDrawArrays(GL_LINE_LOOP, 0, 36);
 +
- 	//uiDrawBoxShade(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) {
  		glDisable(GL_LINE_STIPPLE);
diff --cc source/blender/editors/space_sequencer/sequencer_edit.c
index d085bb8,4ad5219..49a9c76
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@@ -1514,6 -1353,6 +1514,9 @@@ static int sequencer_slip_invoke(bConte
  
  	WM_event_add_modal_handler(C, op);
  
++	/* notify so we draw extensions immediately */
++	WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene);
++
  	return OPERATOR_RUNNING_MODAL;
  }