diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2010-07-13 19:19:15 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2010-07-13 19:19:15 +0400 |
| commit | e86b78c47c7ebfd15ea51de99c02e45790cbf9d7 (patch) | |
| tree | 80a1227acfad33e39dd55335657849e85d636497 /source/blender/editors | |
| parent | 44f1decdc01ffdf8002261c78397b68a9f40b12c (diff) | |
Merging revision 30264:30270 from my GSoC branch to trunk, logs:
Bugfix for [#22284] Blender cursor gets stuck in the timeline when scrubbing (jack transport).
Dirty hack fix for:
* [#22366] Cutting audio and meta strips with audio does not actually cut audio
* [#22639] Audio not clipped to meta bounds
Also fixed a seemingly symptomless bug in sequencer_edit.c
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_edit.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 5aeb50b34c5..50a5414b6ff 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -2448,7 +2448,7 @@ static int screen_animation_step(bContext *C, wmOperator *op, wmEvent *event) else sync= (scene->flag & SCE_FRAME_DROP); if((scene->audio.flag & AUDIO_SYNC) && !(sad->flag & ANIMPLAY_FLAG_REVERSE) && finite(time = sound_sync_scene(scene))) - scene->r.cfra = floor(time * FPS); + scene->r.cfra = round(time * FPS); else { if(sync) { diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c index 19b8e9d7a79..d3d2fd7e220 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.c +++ b/source/blender/editors/space_sequencer/sequencer_edit.c @@ -827,7 +827,7 @@ static Sequence *cut_seq_hard(Scene *scene, Sequence * seq, int cutframe) } reload_sequence_new_file(scene, seqn, FALSE); - calc_sequence(scene, seq); + calc_sequence(scene, seqn); } return seqn; } |