From 748f468fdc7b80b7e84a854c63443050fcacad9c Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Sun, 29 Nov 2020 18:10:47 -0500 Subject: 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". --- source/blender/windowmanager/intern/wm_event_system.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'source/blender/windowmanager') 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); } } -- cgit v1.2.3