[Bf-blender-cvs] [024645d] gooseberry: Merge branch 'master' into gooseberry

[Campbell Barton]

Commit: 024645d8e0b9725bacf5cb2c6a5197cb37d457e9
Author: Campbell Barton
Date:   Thu Nov 13 17:23:19 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB024645d8e0b9725bacf5cb2c6a5197cb37d457e9

Merge branch 'master' into gooseberry

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

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



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

diff --cc source/blender/editors/space_sequencer/sequencer_draw.c
index 8e1b9f2,9fbca7b..6237e39
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@@ -86,8 -82,13 +85,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;
@@@ -193,30 -194,20 +195,30 @@@ static void drawseqwave(const bContext 
  		float samplestep;
  		float startsample, endsample;
  		float value;
 -
 +		bSound *sound = seq->sound;
 +		
  		SoundWaveform *waveform;
 -
 -		if (!seq->sound->waveform)
 -			sound_read_waveform(seq->sound);
 -
 -		if (!seq->sound->waveform)
 -			return;  /* zero length sound */
 -
 +		
 +		if (!sound->mutex)
 +			sound->mutex = BLI_mutex_alloc();
 +		
 +		BLI_mutex_lock(sound->mutex);
 +		if (!seq->sound->waveform) {
 +			if(!(sound->flags & SOUND_FLAGS_WAVEFORM_LOADING)) {
 +				/* prevent sounds from reloading */
 +				seq->sound->flags |= SOUND_FLAGS_WAVEFORM_LOADING;
 +				BLI_mutex_unlock(sound->mutex);
 +				sequencer_preview_add_sound(C, seq);
 +			}
 +			else {
 +				BLI_mutex_unlock(sound->mutex);				
 +			}
 +			return;  /* nothing to draw */
 +		}
 +		BLI_mutex_unlock(sound->mutex);
 +		
  		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);
@@@ -812,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);