Commit: d086c01645e4f089a0dfb03b0267a7107affc490
Author: Sergey Sharybin
Date: Fri Dec 21 16:50:59 2018 +0100
Branches: master
https://developer.blender.org/rBd086c01645e4f089a0dfb03b0267a7107affc490
Fix T59691: Crash when deleting data-block video or audio in a video editor
===================================================================
M source/blender/blenkernel/intern/sound.c
===================================================================
diff --git a/source/blender/blenkernel/intern/sound.c
b/source/blender/blenkernel/intern/sound.c
index 1f1ad4c4f21..829f0e0ab89 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -532,6 +532,10 @@ void *BKE_sound_scene_add_scene_sound_defaults(struct
Scene *scene, struct Seque
void *BKE_sound_add_scene_sound(struct Scene *scene, struct Sequence
*sequence, int startframe, int endframe, int frameskip)
{
+ /* Happens when sequence's sound datablock was removed. */
+ if (sequence->sound == NULL) {
+ return NULL;
+ }
const double fps = FPS;
void *handle = AUD_Sequence_add(scene->sound_scene,
sequence->sound->playback_handle,
startframe / fps, endframe / fps,
frameskip / fps);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
