diff options
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 04767a742ce..efe44ec657b 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -25,7 +25,7 @@ extern "C" { /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -#define BLENDER_FILE_SUBVERSION 3 +#define BLENDER_FILE_SUBVERSION 5 /* Minimum Blender version that supports reading file written with the current * version. Older Blender versions will test this and show a warning if the file 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); } |