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/include/ED_anim_api.h | |
| 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/include/ED_anim_api.h')
| -rw-r--r-- | source/blender/editors/include/ED_anim_api.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index f8d0300cb46..2e810297138 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -84,7 +84,7 @@ typedef struct bAnimContext { /** editor data */ struct SpaceLink *sl; /** region within editor */ - struct ARegion *ar; + struct ARegion *region; /** dopesheet data for editor (or which is being used) */ struct bDopeSheet *ads; @@ -407,7 +407,7 @@ typedef enum eAnimFilter_Flags { /* channel heights */ #define ACHANNEL_FIRST_TOP(ac) \ - (UI_view2d_scale_get_y(&(ac)->ar->v2d) * -UI_TIME_SCRUB_MARGIN_Y - ACHANNEL_SKIP) + (UI_view2d_scale_get_y(&(ac)->region->v2d) * -UI_TIME_SCRUB_MARGIN_Y - ACHANNEL_SKIP) #define ACHANNEL_HEIGHT(ac) (0.8f * (ac)->yscale_fac * U.widget_unit) #define ACHANNEL_SKIP (0.1f * U.widget_unit) #define ACHANNEL_STEP(ac) (ACHANNEL_HEIGHT(ac) + ACHANNEL_SKIP) @@ -425,7 +425,7 @@ typedef enum eAnimFilter_Flags { /* NLA channel heights */ #define NLACHANNEL_FIRST_TOP(ac) \ - (UI_view2d_scale_get_y(&(ac)->ar->v2d) * -UI_TIME_SCRUB_MARGIN_Y - NLACHANNEL_SKIP) + (UI_view2d_scale_get_y(&(ac)->region->v2d) * -UI_TIME_SCRUB_MARGIN_Y - NLACHANNEL_SKIP) #define NLACHANNEL_HEIGHT(snla) \ ((snla && (snla->flag & SNLA_NOSTRIPCURVES)) ? (0.8f * U.widget_unit) : (1.2f * U.widget_unit)) #define NLACHANNEL_SKIP (0.1f * U.widget_unit) |