Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-05-04 20:20:41 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-05-04 20:20:41 +0300
commitc02534469ac30746bb50f9106cdfc97196823537 (patch)
treec2dfb73ca823f6f27da51ddc86fcd5ede59d878b
parent9f681bea68fc1aebc41d43d5bd3b5e73c91f6f45 (diff)
Sound: Delay creating sound scene handle for until is needed
Solves crash loading volume Cycles regression files.
-rw-r--r--source/blender/blenloader/intern/readfile.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 3d9497ae6b8..78c5bdbed1d 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6465,9 +6465,7 @@ static void lib_link_scene(FileData *fd, Main *main)
seq->scene_sound = NULL;
if (seq->scene) {
seq->scene = newlibadr(fd, sce->id.lib, seq->scene);
- if (seq->scene) {
- seq->scene_sound = BKE_sound_scene_add_scene_sound_defaults(sce, seq);
- }
+ seq->scene_sound = NULL;
}
if (seq->clip) {
seq->clip = newlibadr_us(fd, sce->id.lib, seq->clip);