diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-06-17 13:54:56 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-06-17 13:55:24 +0300 |
| commit | b50de0f8b75b9f7af62e09528635f6a9fdbb07cd (patch) | |
| tree | c61b90aa523413997804987e1dc1618fd21e8d37 /source/blender/blenkernel/intern/scene.c | |
| parent | 96e9caba6ef190b9f24f212d444ea60ec6defc4a (diff) | |
Fix T65651: Crash when changing audio strip source file
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 6300d48c700..a250b005bad 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -2456,7 +2456,9 @@ void BKE_scene_eval_sequencer_sequences(Depsgraph *depsgraph, Scene *scene) SEQ_BEGIN (scene->ed, seq) { if (seq->scene_sound == NULL) { if (seq->sound != NULL) { - seq->scene_sound = BKE_sound_add_scene_sound_defaults(scene, seq); + if (seq->scene_sound == NULL) { + seq->scene_sound = BKE_sound_add_scene_sound_defaults(scene, seq); + } } else if (seq->type == SEQ_TYPE_SCENE) { if (seq->scene != NULL) { @@ -2466,6 +2468,9 @@ void BKE_scene_eval_sequencer_sequences(Depsgraph *depsgraph, Scene *scene) } } if (seq->scene_sound) { + if (scene->id.recalc & ID_RECALC_AUDIO || seq->sound->id.recalc & ID_RECALC_AUDIO) { + BKE_sound_update_scene_sound(seq->scene_sound, seq->sound); + } BKE_sound_set_scene_sound_volume( seq->scene_sound, seq->volume, (seq->flag & SEQ_AUDIO_VOLUME_ANIMATED) != 0); BKE_sound_set_scene_sound_pitch( |