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-04-03 13:51:03 +0300
committerJulian Eisel <julian@blender.org>2020-04-03 13:54:28 +0300
commit10c2254d412d7cbee0b0d9f8b7c74a9d3ce69b69 (patch)
treec430e46e04ed888bcbf44af39b780a2986f513ea /source/blender/editors/screen/screen_edit.c
parent7ec59cc7b700952fdbddfbb44a55977e0bf3bcb6 (diff)
Cleanup: Continue renaming ARegion variables from ar to region
Continuation of b2ee1770d4c3, now non-single word variables are also renamed. Part of T74432. Also ran clang-format on affected files.
Diffstat (limited to 'source/blender/editors/screen/screen_edit.c')
-rw-r--r--source/blender/editors/screen/screen_edit.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 0151a0fcb0d..01a30f7d6a4 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -687,7 +687,7 @@ void ED_screen_set_active_region(bContext *C, wmWindow *win, const int xy[2])
ScrArea *sa = NULL;
ARegion *region;
- ARegion *ar_prev = scr->active_region;
+ ARegion *region_prev = scr->active_region;
ED_screen_areas_iter(win, scr, area_iter)
{
@@ -714,7 +714,7 @@ void ED_screen_set_active_region(bContext *C, wmWindow *win, const int xy[2])
}
/* Check for redraw headers. */
- if (ar_prev != scr->active_region) {
+ if (region_prev != scr->active_region) {
ED_screen_areas_iter(win, scr, area_iter)
{
@@ -723,20 +723,20 @@ void ED_screen_set_active_region(bContext *C, wmWindow *win, const int xy[2])
for (region = area_iter->regionbase.first; region; region = region->next) {
/* Call old area's deactivate if assigned. */
- if (region == ar_prev && area_iter->type->deactivate) {
+ if (region == region_prev && area_iter->type->deactivate) {
area_iter->type->deactivate(area_iter);
}
- if (region == ar_prev && region != scr->active_region) {
- wmGizmoMap *gzmap = ar_prev->gizmo_map;
+ if (region == region_prev && region != scr->active_region) {
+ wmGizmoMap *gzmap = region_prev->gizmo_map;
if (gzmap) {
if (WM_gizmo_highlight_set(gzmap, NULL)) {
- ED_region_tag_redraw_no_rebuild(ar_prev);
+ ED_region_tag_redraw_no_rebuild(region_prev);
}
}
}
- if (region == ar_prev || region == scr->active_region) {
+ if (region == region_prev || region == scr->active_region) {
do_draw = true;
}
}
@@ -758,9 +758,9 @@ void ED_screen_set_active_region(bContext *C, wmWindow *win, const int xy[2])
}
else {
/* Notifier invokes freeing the buttons... causing a bit too much redraws. */
- region_cursor_set_ex(win, sa, scr->active_region, ar_prev != scr->active_region);
+ region_cursor_set_ex(win, sa, scr->active_region, region_prev != scr->active_region);
- if (ar_prev != scr->active_region) {
+ if (region_prev != scr->active_region) {
/* This used to be a notifier, but needs to be done immediate
* because it can undo setting the right button as active due
* to delayed notifier handling. */