diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-02-12 15:51:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-02-12 15:51:02 +0300 |
| commit | 7221fbe9ddd4ae446057866079df750368f14681 (patch) | |
| tree | 9f942ed7b3739a9db8cf915a3709a26c9f71d218 /source | |
| parent | e408e632a110a8cf4537c4fcdb5a47478b6110cd (diff) | |
cleanup
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 6db6d8d06a5..99ce1a0dee3 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -2042,7 +2042,8 @@ static void SCREEN_OT_region_scale(wmOperatorType *ot) /* ************** frame change operator ***************************** */ -static void areas_do_frame_follow (bContext *C, bool middle) { +static void areas_do_frame_follow(bContext *C, bool middle) +{ bScreen *scr = CTX_wm_screen(C); Scene *scene = CTX_data_scene(C); wmWindowManager *wm = CTX_wm_manager(C); @@ -2055,15 +2056,15 @@ static void areas_do_frame_follow (bContext *C, bool middle) { /* do follow here if editor type supports it */ if ((scr->redraws_flag & TIME_FOLLOW)) { if ((ar->regiontype == RGN_TYPE_WINDOW && - ELEM (sa->spacetype, SPACE_SEQ, SPACE_TIME, SPACE_IPO, SPACE_ACTION, SPACE_NLA)) || - (sa->spacetype == SPACE_CLIP && ar->regiontype == RGN_TYPE_PREVIEW)) + ELEM(sa->spacetype, SPACE_SEQ, SPACE_TIME, SPACE_IPO, SPACE_ACTION, SPACE_NLA)) || + (sa->spacetype == SPACE_CLIP && ar->regiontype == RGN_TYPE_PREVIEW)) { float w = BLI_rctf_size_x(&ar->v2d.cur); if (middle) { - if (scene->r.cfra < ar->v2d.cur.xmin || scene->r.cfra > ar->v2d.cur.xmax) { - ar->v2d.cur.xmax = scene->r.cfra + w/2; - ar->v2d.cur.xmin = scene->r.cfra - w/2; + if ((scene->r.cfra < ar->v2d.cur.xmin) || (scene->r.cfra > ar->v2d.cur.xmax)) { + ar->v2d.cur.xmax = scene->r.cfra + (w / 2); + ar->v2d.cur.xmin = scene->r.cfra - (w / 2); } } else { @@ -3531,7 +3532,7 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv /* do follow here if editor type supports it */ if ((sad->redraws & TIME_FOLLOW)) { if ((ar->regiontype == RGN_TYPE_WINDOW && - ELEM (sa->spacetype, SPACE_SEQ, SPACE_TIME, SPACE_IPO, SPACE_ACTION, SPACE_NLA)) || + ELEM(sa->spacetype, SPACE_SEQ, SPACE_TIME, SPACE_IPO, SPACE_ACTION, SPACE_NLA)) || (sa->spacetype == SPACE_CLIP && ar->regiontype == RGN_TYPE_PREVIEW)) { float w = BLI_rctf_size_x(&ar->v2d.cur); |