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/gpencil/drawgpencil.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/gpencil/drawgpencil.c')
| -rw-r--r-- | source/blender/editors/gpencil/drawgpencil.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index 9fef1e4948b..4d879306cec 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -1120,8 +1120,8 @@ static void gp_draw_strokes(tGPDdraw *tgpw) void ED_gp_draw_interpolation(const bContext *C, tGPDinterpolate *tgpi, const int type) { tGPDdraw tgpw; - ARegion *ar = CTX_wm_region(C); - RegionView3D *rv3d = ar->regiondata; + ARegion *region = CTX_wm_region(C); + RegionView3D *rv3d = region->regiondata; tGPDinterpolate_layer *tgpil; Object *obact = CTX_data_active_object(C); /* Drawing code is expected to run with fully evaluated depsgraph. */ @@ -1143,8 +1143,8 @@ void ED_gp_draw_interpolation(const bContext *C, tGPDinterpolate *tgpi, const in tgpw.gpd = tgpi->gpd; tgpw.offsx = 0; tgpw.offsy = 0; - tgpw.winx = tgpi->ar->winx; - tgpw.winy = tgpi->ar->winy; + tgpw.winx = tgpi->region->winx; + tgpw.winy = tgpi->region->winy; tgpw.dflag = dflag; /* turn on alpha-blending */ @@ -1180,7 +1180,7 @@ void ED_gp_draw_fill(tGPDdraw *tgpw) } /* draw a short status message in the top-right corner */ -static void UNUSED_FUNCTION(gp_draw_status_text)(const bGPdata *gpd, ARegion *ar) +static void UNUSED_FUNCTION(gp_draw_status_text)(const bGPdata *gpd, ARegion *region) { /* Cannot draw any status text when drawing OpenGL Renders */ @@ -1189,7 +1189,7 @@ static void UNUSED_FUNCTION(gp_draw_status_text)(const bGPdata *gpd, ARegion *ar } /* Get bounds of region - Necessary to avoid problems with region overlap. */ - const rcti *rect = ED_region_visible_rect(ar); + const rcti *rect = ED_region_visible_rect(region); /* for now, this should only be used to indicate when we are in stroke editmode */ if (gpd->flag & GP_DATA_STROKE_EDITMODE) { |