Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2020-03-06 18:56:42 +0300
committerJulian Eisel <julian@blender.org>2020-03-06 19:19:23 +0300
commitb2ee1770d4c31078518f4ec9edd5196a41345162 (patch)
tree6b7f6ff9057322245fc3b3407bece3f1c0cb3eb5 /source/blender/editors/interface/interface_eyedropper_datablock.c
parentb825a95ec311a169d33fe21e28418f11a516c82f (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/interface/interface_eyedropper_datablock.c')
-rw-r--r--source/blender/editors/interface/interface_eyedropper_datablock.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/interface/interface_eyedropper_datablock.c b/source/blender/editors/interface/interface_eyedropper_datablock.c
index 0220f3f5afd..5cf1a21d09c 100644
--- a/source/blender/editors/interface/interface_eyedropper_datablock.c
+++ b/source/blender/editors/interface/interface_eyedropper_datablock.c
@@ -74,10 +74,10 @@ typedef struct DataDropper {
char name[200];
} DataDropper;
-static void datadropper_draw_cb(const struct bContext *C, ARegion *ar, void *arg)
+static void datadropper_draw_cb(const struct bContext *C, ARegion *region, void *arg)
{
DataDropper *ddr = arg;
- eyedropper_draw_cursor_text(C, ar, ddr->name);
+ eyedropper_draw_cursor_text(C, region, ddr->name);
}
static int datadropper_init(bContext *C, wmOperator *op)
@@ -161,16 +161,16 @@ static void datadropper_id_sample_pt(bContext *C, DataDropper *ddr, int mx, int
if (sa) {
if (ELEM(sa->spacetype, SPACE_VIEW3D, SPACE_OUTLINER)) {
- ARegion *ar = BKE_area_find_region_xy(sa, RGN_TYPE_WINDOW, mx, my);
- if (ar) {
- const int mval[2] = {mx - ar->winrct.xmin, my - ar->winrct.ymin};
+ ARegion *region = BKE_area_find_region_xy(sa, RGN_TYPE_WINDOW, mx, my);
+ if (region) {
+ const int mval[2] = {mx - region->winrct.xmin, my - region->winrct.ymin};
Base *base;
CTX_wm_area_set(C, sa);
- CTX_wm_region_set(C, ar);
+ CTX_wm_region_set(C, region);
/* grr, always draw else we leave stale text */
- ED_region_tag_redraw(ar);
+ ED_region_tag_redraw(region);
if (sa->spacetype == SPACE_VIEW3D) {
base = ED_view3d_give_base_under_cursor(C, mval);
@@ -259,8 +259,8 @@ static void datadropper_set_draw_callback_region(bContext *C,
ED_region_draw_cb_exit(ddr->art, ddr->draw_handle_pixel);
/* Redraw old area */
- ARegion *ar = BKE_area_find_region_type(ddr->cursor_area, RGN_TYPE_WINDOW);
- ED_region_tag_redraw(ar);
+ ARegion *region = BKE_area_find_region_type(ddr->cursor_area, RGN_TYPE_WINDOW);
+ ED_region_tag_redraw(region);
/* Set draw callback in new region */
ARegionType *art = BKE_regiontype_from_id(sa->type, RGN_TYPE_WINDOW);