diff options
author | Richard Antalik <ISS> | 2019-10-23 03:30:43 +0300 |
---|---|---|
committer | Richard Antalik <richardantalik@gmail.com> | 2019-10-23 03:34:14 +0300 |
commit | 15d27c1ae53adc7d768fc6ca13073e74fbb36ee4 (patch) | |
tree | 1585b5ddc7bdca74637b54a073df0976a4284438 /source/blender/makesrna/intern | |
parent | ac18c3c28dee2f6a57be8620c7e9dbf2751a21f0 (diff) |
Fix T70845: Crash when switching scene of scene strip.
Crash on assert in `sound_verify_evaluated_id()`
Reviewed By: sergey
Maniphest Tasks: T70845
Differential Revision: https://developer.blender.org/D6104
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r-- | source/blender/makesrna/intern/rna_sequencer.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 31ead989f25..18985d41551 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -157,6 +157,13 @@ static void rna_Sequence_invalidate_composite_update(Main *UNUSED(bmain), } } +static void rna_Sequence_scene_switch_update(Main *bmain, Scene *scene, PointerRNA *ptr) +{ + rna_Sequence_invalidate_raw_update(bmain, scene, ptr); + DEG_id_tag_update(&scene->id, ID_RECALC_AUDIO | ID_RECALC_SEQUENCER_STRIPS); + DEG_relations_tag_update(bmain); +} + static void rna_Sequence_use_sequence(Main *bmain, Scene *scene, PointerRNA *ptr) { /* General update callback. */ @@ -2227,7 +2234,7 @@ static void rna_def_scene(BlenderRNA *brna) prop = RNA_def_property(srna, "scene", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK); RNA_def_property_ui_text(prop, "Scene", "Scene that this sequence uses"); - RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_raw_update"); + RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_scene_switch_update"); prop = RNA_def_property(srna, "scene_camera", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_EDITABLE); |