[Bf-blender-cvs] [30aa67d5d57] master: Fix T69558: crash in BKE_scene_update_sound for a soundstrip without linked sound
Philipp Oeser
noreply at git.blender.org
Wed Sep 11 17:49:29 CEST 2019
Commit: 30aa67d5d57b3ee4a1f72bfdbb5ee53600ce7fcd
Author: Philipp Oeser
Date: Wed Sep 11 17:36:52 2019 +0200
Branches: master
https://developer.blender.org/rB30aa67d5d57b3ee4a1f72bfdbb5ee53600ce7fcd
Fix T69558: crash in BKE_scene_update_sound for a soundstrip without
linked sound
Crash could be triggered by just adding any object to the scene.
Reviewers: sergey
Maniphest Tasks: T69558
Differential Revision: https://developer.blender.org/D5764
===================================================================
M source/blender/blenkernel/intern/sequencer.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index dca6f05e0de..14096335626 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -4933,7 +4933,7 @@ static bool sequencer_refresh_sound_length_recursive(Main *bmain, Scene *scene,
changed = true;
}
}
- else if (seq->type == SEQ_TYPE_SOUND_RAM) {
+ else if (seq->type == SEQ_TYPE_SOUND_RAM && seq->sound) {
const float length = BKE_sound_get_length(bmain, seq->sound);
int old = seq->len;
float fac;
More information about the Bf-blender-cvs
mailing list