diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-07-08 16:57:33 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-07-08 16:57:33 +0300 |
commit | 9cb1810551a257043f1f6db7e320b690ff4391f4 (patch) | |
tree | 86dd06e5956a7894a9a9d7677e232c2d83b370f1 /source/blender/blenkernel/intern | |
parent | 8066784ac232e4c527a77d9cc7b7328e8407e21b (diff) |
Fix T66431: SE - Audio Caching crash
Moved the caching code from direct calls in DNA to dependency graph.
In fact, not much was needed to be done apart form removing the direct
cache updates. The rest seemed to work fine.
Possible to avoid full sound file re-load, but doesn't seem this is
causing any issues.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sound.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index f2e0ee0c7fa..ceb06c29f09 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -5400,7 +5400,7 @@ static void seq_load_apply(Main *bmain, Scene *scene, Sequence *seq, SeqLoadInfo if (seq_load->flag & SEQ_LOAD_SOUND_CACHE) { if (seq->sound) { - BKE_sound_cache(seq->sound); + seq->sound->flags |= SOUND_FLAGS_CACHING; } } diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 1722b888d28..6d782726e07 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -389,7 +389,6 @@ void BKE_sound_cache(bSound *sound) { sound_verify_evaluated_id(&sound->id); - sound->flags |= SOUND_FLAGS_CACHING; if (sound->cache) { AUD_Sound_free(sound->cache); } @@ -405,7 +404,6 @@ void BKE_sound_cache(bSound *sound) void BKE_sound_delete_cache(bSound *sound) { - sound->flags &= ~SOUND_FLAGS_CACHING; if (sound->cache) { AUD_Sound_free(sound->cache); sound->cache = NULL; |