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/sculpt_paint/paint_mask.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/sculpt_paint/paint_mask.c')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_mask.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c index c8f4bdc0522..d6e5559b810 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.c +++ b/source/blender/editors/sculpt_paint/paint_mask.c @@ -137,7 +137,7 @@ static void mask_flood_fill_task_cb(void *__restrict userdata, static int mask_flood_fill_exec(bContext *C, wmOperator *op) { - ARegion *ar = CTX_wm_region(C); + ARegion *region = CTX_wm_region(C); Object *ob = CTX_data_active_object(C); Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); PaintMaskFloodMode mode; @@ -184,7 +184,7 @@ static int mask_flood_fill_exec(bContext *C, wmOperator *op) MEM_freeN(nodes); } - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); @@ -298,7 +298,7 @@ bool ED_sculpt_mask_box_select(struct bContext *C, ViewContext *vc, const rcti * BoundBox bb; float clip_planes[4][4]; float clip_planes_final[4][4]; - ARegion *ar = vc->ar; + ARegion *region = vc->region; Object *ob = vc->obact; PaintMaskFloodMode mode; bool multires; @@ -311,7 +311,7 @@ bool ED_sculpt_mask_box_select(struct bContext *C, ViewContext *vc, const rcti * float value = select ? 1.0f : 0.0f; /* Transform the clip planes in object space. */ - ED_view3d_clipping_calc(&bb, clip_planes, vc->ar, vc->obact, rect); + ED_view3d_clipping_calc(&bb, clip_planes, vc->region, vc->obact, rect); BKE_sculpt_update_object_for_edit(depsgraph, ob, false, true); pbvh = ob->sculpt->pbvh; @@ -361,7 +361,7 @@ bool ED_sculpt_mask_box_select(struct bContext *C, ViewContext *vc, const rcti * SCULPT_undo_push_end(); - ED_region_tag_redraw(ar); + ED_region_tag_redraw(region); WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob); @@ -392,7 +392,7 @@ static bool is_effected_lasso(LassoMaskData *data, float co[3]) flip_v3_v3(co_final, co, data->symmpass); /* First project point to 2d space. */ - ED_view3d_project_float_v2_m4(data->vc->ar, co_final, scr_co_f, data->projviewobjmat); + ED_view3d_project_float_v2_m4(data->vc->region, co_final, scr_co_f, data->projviewobjmat); scr_co_s[0] = scr_co_f[0]; scr_co_s[1] = scr_co_f[1]; @@ -498,7 +498,7 @@ static int paint_mask_gesture_lasso_exec(bContext *C, wmOperator *op) mask_lasso_px_cb, &data); - ED_view3d_clipping_calc(&bb, clip_planes, vc.ar, vc.obact, &data.rect); + ED_view3d_clipping_calc(&bb, clip_planes, vc.region, vc.obact, &data.rect); BKE_sculpt_update_object_for_edit(depsgraph, ob, false, true); pbvh = ob->sculpt->pbvh; @@ -550,7 +550,7 @@ static int paint_mask_gesture_lasso_exec(bContext *C, wmOperator *op) SCULPT_undo_push_end(); - ED_region_tag_redraw(vc.ar); + ED_region_tag_redraw(vc.region); MEM_freeN((void *)mcords); MEM_freeN(data.px); |