diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-02-18 20:00:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-02-18 20:00:24 +0300 |
| commit | b5adeb922f39dc0424bfbf9fa0ce44c9c917a5a9 (patch) | |
| tree | f529483a8f21cc7a0ac016c6d1a2421aad5e8bea /source/blender/editors | |
| parent | 3142c4367cc3648c30c57a070f8bc22513dafaa9 (diff) | |
revert 27010, sorry but this makes playback of animation unusable & jerky, we can provide some sample files for testing.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index bbab671a889..728ce622d9b 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -2429,17 +2429,13 @@ static int screen_animation_step(bContext *C, wmOperator *op, wmEvent *event) else sync= (scene->audio.flag & AUDIO_SYNC); if(sync) { + /* skip frames */ + int step = floor(wt->duration * FPS); if(sad->flag & ANIMPLAY_FLAG_REVERSE) // XXX does this option work with audio? - { // XXX - no - /* skip frames */ - int step = floor(wt->duration * FPS); scene->r.cfra -= step; - wt->duration -= ((float)step)/FPS; - } else - { - scene->r.cfra = floor(sound_sync_scene(scene) * FPS); - } + scene->r.cfra += step; + wt->duration -= ((float)step)/FPS; } else { /* one frame +/- */ |