diff options
author | Julian Eisel <julian@blender.org> | 2020-03-06 18:56:42 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-03-06 19:19:23 +0300 |
commit | b2ee1770d4c31078518f4ec9edd5196a41345162 (patch) | |
tree | 6b7f6ff9057322245fc3b3407bece3f1c0cb3eb5 /source/blender/editors/animation/anim_draw.c | |
parent | b825a95ec311a169d33fe21e28418f11a516c82f (diff) |
Cleanup: Rename ARegion variables from ar to region
The old convention was easy to confuse with ScrArea.
Part of https://developer.blender.org/T74432.
This is mostly a batch rename with some manual fixing. Only single word
variable names are changed, no prefixed/suffixed names.
Brecht van Lommel and Campbell Barton both gave me a green light for
this convention change.
Also ran clan clang format on affected files.
Diffstat (limited to 'source/blender/editors/animation/anim_draw.c')
-rw-r--r-- | source/blender/editors/animation/anim_draw.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index 40b2706cc75..abcc2fe5291 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -615,9 +615,9 @@ static bool find_prev_next_keyframes(struct bContext *C, int *nextfra, int *prev void ANIM_center_frame(struct bContext *C, int smooth_viewtx) { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); Scene *scene = CTX_data_scene(C); - float w = BLI_rctf_size_x(&ar->v2d.cur); + float w = BLI_rctf_size_x(®ion->v2d.cur); rctf newrct; int nextfra, prevfra; @@ -626,8 +626,8 @@ void ANIM_center_frame(struct bContext *C, int smooth_viewtx) const float fps = FPS; newrct.xmax = scene->r.cfra + U.view_frame_seconds * fps + 1; newrct.xmin = scene->r.cfra - U.view_frame_seconds * fps - 1; - newrct.ymax = ar->v2d.cur.ymax; - newrct.ymin = ar->v2d.cur.ymin; + newrct.ymax = region->v2d.cur.ymax; + newrct.ymin = region->v2d.cur.ymin; break; } @@ -636,8 +636,8 @@ void ANIM_center_frame(struct bContext *C, int smooth_viewtx) if (find_prev_next_keyframes(C, &nextfra, &prevfra)) { newrct.xmax = nextfra; newrct.xmin = prevfra; - newrct.ymax = ar->v2d.cur.ymax; - newrct.ymin = ar->v2d.cur.ymin; + newrct.ymax = region->v2d.cur.ymax; + newrct.ymin = region->v2d.cur.ymin; break; } /* else drop through, keep range instead */ @@ -647,11 +647,11 @@ void ANIM_center_frame(struct bContext *C, int smooth_viewtx) default: newrct.xmax = scene->r.cfra + (w / 2); newrct.xmin = scene->r.cfra - (w / 2); - newrct.ymax = ar->v2d.cur.ymax; - newrct.ymin = ar->v2d.cur.ymin; + newrct.ymax = region->v2d.cur.ymax; + newrct.ymin = region->v2d.cur.ymin; break; } - UI_view2d_smooth_view(C, ar, &newrct, smooth_viewtx); + UI_view2d_smooth_view(C, region, &newrct, smooth_viewtx); } /* *************************************************** */ |