diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-07-19 15:25:23 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-07-19 15:25:23 +0400 |
| commit | 185036c3ed3d623c580834604deca4beab514e35 (patch) | |
| tree | 17a78096bcfbb49a764fe8933d511e1b268da9d8 /source/blender/editors/screen/screen_edit.c | |
| parent | 51087061767db1329ebe2c45b8640c50cff69dd7 (diff) | |
Bugfix #22906: Animation Player buttons broke on r30467
Reverting this commit. Seems that only the added parts were tested. I'll look at restoring a similar version of this in future.
Diffstat (limited to 'source/blender/editors/screen/screen_edit.c')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 3e56e601788..952f34ae2be 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1653,7 +1653,7 @@ void ED_refresh_viewport_fps(bContext *C) /* redraws: uses defines from stime->redraws * enable: 1 - forward on, -1 - backwards on, 0 - off */ -void ED_screen_animation_timer(bContext *C, int redraws, int refresh, int sync, int enable, double speed) +void ED_screen_animation_timer(bContext *C, int redraws, int refresh, int sync, int enable) { bScreen *screen= CTX_wm_screen(C); wmWindowManager *wm= CTX_wm_manager(C); @@ -1666,14 +1666,16 @@ void ED_screen_animation_timer(bContext *C, int redraws, int refresh, int sync, if(enable) { ScreenAnimData *sad= MEM_callocN(sizeof(ScreenAnimData), "ScreenAnimData"); - screen->animtimer= WM_event_add_timer(wm, win, TIMER0, (1.0/(FPS*speed))); + + screen->animtimer= WM_event_add_timer(wm, win, TIMER0, (1.0/FPS)); + sad->ar= CTX_wm_region(C); sad->sfra = scene->r.cfra; sad->redraws= redraws; sad->refresh= refresh; - sad->speed_mul= speed; sad->flag |= (enable < 0)? ANIMPLAY_FLAG_REVERSE: 0; sad->flag |= (sync == 0)? ANIMPLAY_FLAG_NO_SYNC: (sync == 1)? ANIMPLAY_FLAG_SYNC: 0; + screen->animtimer->customdata= sad; } |