Commit: c450461e68cdd723825c7bf4a4ebde079ba7b57b Author: Richard Antalik Date: Sun Jan 13 21:25:29 2019 -0800 Branches: master https://developer.blender.org/rBc450461e68cdd723825c7bf4a4ebde079ba7b57b
Fix crash on scene unlink Reviewed by: Brecht Differential Revision: https://developer.blender.org/D4200 =================================================================== M source/blender/blenkernel/intern/sound.c =================================================================== diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 829f0e0ab89..39c13031f13 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -515,7 +515,7 @@ void BKE_sound_update_scene_listener(struct Scene *scene) void *BKE_sound_scene_add_scene_sound(struct Scene *scene, struct Sequence *sequence, int startframe, int endframe, int frameskip) { - if (scene != sequence->scene) { + if (sequence->scene && scene != sequence->scene) { const double fps = FPS; return AUD_Sequence_add(scene->sound_scene, sequence->scene->sound_scene, startframe / fps, endframe / fps, frameskip / fps); _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
