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:
authorHans Goudey <h.goudey@me.com>2020-11-30 02:10:47 +0300
committerHans Goudey <h.goudey@me.com>2020-11-30 02:10:47 +0300
commit748f468fdc7b80b7e84a854c63443050fcacad9c (patch)
treea699415443baf6df330e3ab5542e071dbcc7dcee /source/blender/windowmanager/intern/wm_event_system.c
parentdca9aa0053f7d711c1b42a4f2042827a1e286bea (diff)
Cleanup: Use "region" for ARegion variable names
As proposed in T74432 and already implemented in several commits, "region" is the preferred name for `ARegion` variables, rather than any variant of "ar". This commit changes a few "ar" variables that have popped up over time and also adjusted names of variants like "arnew".
Diffstat (limited to 'source/blender/windowmanager/intern/wm_event_system.c')
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 1aaefeabd08..1bd8c675807 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -1492,16 +1492,11 @@ static int wm_operator_call_internal(bContext *C,
}
if (!(region && region->regiontype == type) && area) {
- ARegion *ar1;
- if (type == RGN_TYPE_WINDOW) {
- ar1 = BKE_area_find_region_active_win(area);
- }
- else {
- ar1 = BKE_area_find_region_type(area, type);
- }
-
- if (ar1) {
- CTX_wm_region_set(C, ar1);
+ ARegion *region_other = (type == RGN_TYPE_WINDOW) ?
+ BKE_area_find_region_active_win(area) :
+ BKE_area_find_region_type(area, type);
+ if (region_other) {
+ CTX_wm_region_set(C, region_other);
}
}