Commit: 598180f98dfbf47bf84def4b79c5693c8e227769
Author: Campbell Barton
Date: Mon Jan 4 19:41:26 2016 +1100
Branches: master
https://developer.blender.org/rB598180f98dfbf47bf84def4b79c5693c8e227769
Fix crash sequencer drawing with no sound
===================================================================
M source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c
b/source/blender/editors/space_sequencer/sequencer_draw.c
index 393e729..8e789c0 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -197,7 +197,7 @@ static void drawseqwave(const bContext *C, SpaceSeq *sseq,
Scene *scene, Sequenc
* x2 the end x value, same for y1 and y2
* stepsize is width of a pixel.
*/
- if ((sseq->flag & SEQ_ALL_WAVEFORMS) || (seq->flag &
SEQ_AUDIO_DRAW_WAVEFORM)) {
+ if (seq->sound && ((sseq->flag & SEQ_ALL_WAVEFORMS) || (seq->flag &
SEQ_AUDIO_DRAW_WAVEFORM))) {
int i, j, pos;
int length = floor((x2 - x1) / stepsize) + 1;
float ymid = (y1 + y2) / 2;
@@ -215,10 +215,10 @@ static void drawseqwave(const bContext *C, SpaceSeq
*sseq, Scene *scene, Sequenc
}
BLI_spin_lock(sound->spinlock);
- if (!seq->sound->waveform) {
+ if (!sound->waveform) {
if (!(sound->flags & SOUND_FLAGS_WAVEFORM_LOADING)) {
/* prevent sounds from reloading */
- seq->sound->flags |=
SOUND_FLAGS_WAVEFORM_LOADING;
+ sound->flags |= SOUND_FLAGS_WAVEFORM_LOADING;
BLI_spin_unlock(sound->spinlock);
sequencer_preview_add_sound(C, seq);
}
@@ -229,7 +229,7 @@ static void drawseqwave(const bContext *C, SpaceSeq *sseq,
Scene *scene, Sequenc
}
BLI_spin_unlock(sound->spinlock);
- waveform = seq->sound->waveform;
+ waveform = sound->waveform;
if (waveform->length == 0) {
/* BKE_sound_read_waveform() set an empty SoundWaveform
data in case it cannot generate a valid one...
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
