[Bf-blender-cvs] [c02534469ac] master: Sound: Delay creating sound scene handle for until is needed

Sergey Sharybin noreply at git.blender.org
Sat May 4 19:21:21 CEST 2019


Commit: c02534469ac30746bb50f9106cdfc97196823537
Author: Sergey Sharybin
Date:   Sat May 4 19:20:41 2019 +0200
Branches: master
https://developer.blender.org/rBc02534469ac30746bb50f9106cdfc97196823537

Sound: Delay creating sound scene handle for until is needed

Solves crash loading volume Cycles regression files.

===================================================================

M	source/blender/blenloader/intern/readfile.c

===================================================================

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);



More information about the Bf-blender-cvs mailing list