[Bf-blender-cvs] [f24a7fa31df] master: Fix T65558: Crash on adding linked scene to Video Sequence Editor

Sergey Sharybin noreply at git.blender.org
Fri Jun 7 09:12:47 CEST 2019


Commit: f24a7fa31dfed0a661cb6d9fd8ebd73d42a97a40
Author: Sergey Sharybin
Date:   Thu Jun 6 15:05:20 2019 +0200
Branches: master
https://developer.blender.org/rBf24a7fa31dfed0a661cb6d9fd8ebd73d42a97a40

Fix T65558: Crash on adding linked scene to Video Sequence Editor

This commit fixes crash but the possible 3D sound is still missing.
Also, sound from sequencer coming from a scene strip is also missing.

This is partially a regression, at least for F12 case. The editing
was already behaving wrong: it was needed to have scene strip to be
actually rendered in preview.

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

M	source/blender/editors/space_sequencer/sequencer_add.c

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

diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index 61471477695..192c0984dbb 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -344,9 +344,6 @@ static int sequencer_add_scene_strip_exec(bContext *C, wmOperator *op)
   BLI_strncpy(seq->name + 2, sce_seq->id.name + 2, sizeof(seq->name) - 2);
   BKE_sequence_base_unique_name_recursive(&ed->seqbase, seq);
 
-  seq->scene_sound = BKE_sound_scene_add_scene_sound(
-      scene, seq, start_frame, start_frame + seq->len, 0);
-
   BKE_sequence_calc_disp(scene, seq);
   BKE_sequencer_sort(scene);



More information about the Bf-blender-cvs mailing list