diff options
| author | Xavier Hallade <xavier.hallade@intel.com> | 2022-06-29 17:31:04 +0300 |
|---|---|---|
| committer | Xavier Hallade <xavier.hallade@intel.com> | 2022-06-29 17:31:04 +0300 |
| commit | 5299deca6deb5109aeab62c2755c92dbc711601b (patch) | |
| tree | c905401fae4b0271d28f73be44a2f0581b681851 /source/blender/blenkernel/intern/sound.c | |
| parent | 45feeabe7ed3863074bb824e59b982301656622d (diff) | |
| parent | 2ac5b55289d361de7fccc9be188b98df358ab932 (diff) | |
Merge branch 'master' into cycles_oneapicycles_oneapi
Diffstat (limited to 'source/blender/blenkernel/intern/sound.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 5bafce15b34..343a829cf76 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -720,8 +720,8 @@ void *BKE_sound_scene_add_scene_sound_defaults(Scene *scene, Sequence *sequence) { return BKE_sound_scene_add_scene_sound(scene, sequence, - SEQ_time_left_handle_frame_get(sequence), - SEQ_time_right_handle_frame_get(sequence), + SEQ_time_left_handle_frame_get(scene, sequence), + SEQ_time_right_handle_frame_get(scene, sequence), sequence->startofs + sequence->anim_startofs); } @@ -746,8 +746,8 @@ void *BKE_sound_add_scene_sound_defaults(Scene *scene, Sequence *sequence) { return BKE_sound_add_scene_sound(scene, sequence, - SEQ_time_left_handle_frame_get(sequence), - SEQ_time_right_handle_frame_get(sequence), + SEQ_time_left_handle_frame_get(scene, sequence), + SEQ_time_right_handle_frame_get(scene, sequence), sequence->startofs + sequence->anim_startofs); } @@ -779,8 +779,8 @@ void BKE_sound_move_scene_sound_defaults(Scene *scene, Sequence *sequence) if (sequence->scene_sound) { BKE_sound_move_scene_sound(scene, sequence->scene_sound, - SEQ_time_left_handle_frame_get(sequence), - SEQ_time_right_handle_frame_get(sequence), + SEQ_time_left_handle_frame_get(scene, sequence), + SEQ_time_right_handle_frame_get(scene, sequence), sequence->startofs + sequence->anim_startofs, 0.0); } |