Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_sequencer / sequencer_draw.c
index 47059d659452a3e656a5a976357b8ca1d0ba9796..864609e41576bfe1cf4f4e9184d1bbf81386478a 100644 (file)
@@ -232,9 +232,9 @@ static void drawseqwave(View2D *v2d, const bContext *C, SpaceSeq *sseq, Scene *s
 
                BLI_spin_lock(sound->spinlock);
                if (!sound->waveform) {
 
                BLI_spin_lock(sound->spinlock);
                if (!sound->waveform) {
-                       if (!(sound->flags & SOUND_FLAGS_WAVEFORM_LOADING)) {
+                       if (!(sound->tags & SOUND_TAGS_WAVEFORM_LOADING)) {
                                /* prevent sounds from reloading */
                                /* prevent sounds from reloading */
-                               sound->flags |= SOUND_FLAGS_WAVEFORM_LOADING;
+                               sound->tags |= SOUND_TAGS_WAVEFORM_LOADING;
                                BLI_spin_unlock(sound->spinlock);
                                sequencer_preview_add_sound(C, seq);
                        }
                                BLI_spin_unlock(sound->spinlock);
                                sequencer_preview_add_sound(C, seq);
                        }