diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-10-14 02:19:29 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-10-14 02:19:29 +0400 |
| commit | 9e17ecf0100af4e95f32a7b03673e880a9fc8d1e (patch) | |
| tree | 9e01ee9208ba5e5e900b6bf18a5c95cd2f67c4e4 /source/blender/editors | |
| parent | d893ac690cfe34e922d34a65a1ca526f8297c129 (diff) | |
Fixing [#28907] Frozen playback.
Also fixing two more crashes when audio files don't exist/cannot be read and apply a changed file path of a sound, reported by Jens Verwiebe in IRC.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 8f1ea6fe254..13e54c9a4c0 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -192,6 +192,9 @@ static void drawseqwave(Scene *scene, Sequence *seq, float x1, float y1, float x 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); |