diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-08-17 14:39:03 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-08-17 14:39:03 +0400 |
| commit | 7798ed75d425978539b6fdad2837964c301a9f20 (patch) | |
| tree | 4db5e8fbd63c50d75a22c4406a4af25cd6872444 /source/blender/editors/screen | |
| parent | ddd7bfc91bb7acb65d17be26be5e1e018acdea7c (diff) | |
2.5 - Bugfixes:
* Reverse playback works again. Flag was getting overriden before it had a chance to do anything
* Active KeyingSet field in TimeLine header should now only be marked as editable when there are some Keying Sets. However, there still seems to be a bug when trying to change this...
TODO (Brecht?): it would be nice to be able to specify a list/collection of data for pointer-buttons that aren't ID's.
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 96f5a9f1b64..76a62128e91 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1532,8 +1532,8 @@ void ED_screen_animation_timer(bContext *C, int redraws, int sync, int enable) screen->animtimer= WM_event_add_window_timer(win, TIMER0, (1.0/FPS)); sad->ar= CTX_wm_region(C); sad->redraws= redraws; - sad->flag= (enable < 0)? ANIMPLAY_FLAG_REVERSE: 0; - sad->flag= (sync == 0)? ANIMPLAY_FLAG_NO_SYNC: (sync == 1)? ANIMPLAY_FLAG_SYNC: 0; + 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; } |