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:
authorRichard Antalik <richardantalik@gmail.com>2021-10-16 02:25:27 +0300
committerRichard Antalik <richardantalik@gmail.com>2021-10-16 02:28:59 +0300
commit5fed3aec4a077b1d14266fc3068241ee8fdd1d7d (patch)
treec09b4067d4f752302cbf7be2cc2d27cf52923665 /source/blender/sequencer/intern
parent138fdf78ba4c4d691e1ed3a474735b5cffa553b7 (diff)
VSE: Fix crash when scene strip is added to meta
Caused by 81514b0e913b, missed sanitizing `sound->offset_time` usage in `seq_update_sound_bounds_recursive_impl()`.
Diffstat (limited to 'source/blender/sequencer/intern')
-rw-r--r--source/blender/sequencer/intern/strip_time.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/sequencer/intern/strip_time.c b/source/blender/sequencer/intern/strip_time.c
index 3c80e1dba27..1c5f4c3ab76 100644
--- a/source/blender/sequencer/intern/strip_time.c
+++ b/source/blender/sequencer/intern/strip_time.c
@@ -131,12 +131,17 @@ static void seq_update_sound_bounds_recursive_impl(Scene *scene,
endofs = seq->start + seq->len - end;
}
+ double offset_time = 0.0f;
+ if (seq->sound != NULL) {
+ offset_time = seq->sound->offset_time;
+ }
+
BKE_sound_move_scene_sound(scene,
seq->scene_sound,
seq->start + startofs,
seq->start + seq->len - endofs,
startofs + seq->anim_startofs,
- seq->sound->offset_time);
+ offset_time);
}
}
}