From b2ee1770d4c31078518f4ec9edd5196a41345162 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Fri, 6 Mar 2020 16:56:42 +0100 Subject: 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. --- source/blender/editors/sculpt_paint/paint_intern.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/editors/sculpt_paint/paint_intern.h') diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h index 2fe585aa9ea..018d7f72bb6 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.h +++ b/source/blender/editors/sculpt_paint/paint_intern.h @@ -174,7 +174,7 @@ struct VertProjHandle *ED_vpaint_proj_handle_create(struct Depsgraph *depsgraph, void ED_vpaint_proj_handle_update(struct Depsgraph *depsgraph, struct VertProjHandle *vp_handle, /* runtime vars */ - struct ARegion *ar, + struct ARegion *region, const float mval_fl[2]); void ED_vpaint_proj_handle_free(struct VertProjHandle *vp_handle); @@ -261,7 +261,7 @@ void SCULPT_OT_uv_sculpt_stroke(struct wmOperatorType *ot); bool paint_convert_bb_to_rect(struct rcti *rect, const float bb_min[3], const float bb_max[3], - const struct ARegion *ar, + const struct ARegion *region, struct RegionView3D *rv3d, struct Object *ob); @@ -269,7 +269,7 @@ bool paint_convert_bb_to_rect(struct rcti *rect, * screen_rect from screen into object-space (essentially converting a * 2D screens-space bounding box into four 3D planes) */ void paint_calc_redraw_planes(float planes[4][4], - const struct ARegion *ar, + const struct ARegion *region, struct Object *ob, const struct rcti *screen_rect); @@ -288,7 +288,7 @@ void paint_get_tex_pixel_col(const struct MTex *mtex, struct ColorSpace *colorspace); void paint_sample_color( - struct bContext *C, struct ARegion *ar, int x, int y, bool texpaint_proj, bool palette); + struct bContext *C, struct ARegion *region, int x, int y, bool texpaint_proj, bool palette); void paint_stroke_operator_properties(struct wmOperatorType *ot); -- cgit v1.2.3