From 20b438d523c9c2fb8577602c053b4f51267300b6 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Sun, 26 Dec 2021 15:08:32 -0500 Subject: Cleanup: Use array for BKE cursor functions Missed this function in rB67525b88d2e --- source/blender/blenkernel/BKE_screen.h | 4 ++-- source/blender/blenkernel/intern/screen.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h index db4c66959c5..3d8b48e5192 100644 --- a/source/blender/blenkernel/BKE_screen.h +++ b/source/blender/blenkernel/BKE_screen.h @@ -473,8 +473,8 @@ struct ARegion *BKE_area_find_region_xy(struct ScrArea *area, */ struct ARegion *BKE_screen_find_region_xy(struct bScreen *screen, const int regiontype, - int x, - int y) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1); + const int xy[2]) ATTR_WARN_UNUSED_RESULT + ATTR_NONNULL(1, 3); struct ARegion *BKE_screen_find_main_region_at_xy(struct bScreen *screen, const int space_type, diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index 363e1f85575..6e352b6ba90 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -916,11 +916,11 @@ ARegion *BKE_area_find_region_xy(ScrArea *area, const int regiontype, const int return NULL; } -ARegion *BKE_screen_find_region_xy(bScreen *screen, const int regiontype, int x, int y) +ARegion *BKE_screen_find_region_xy(bScreen *screen, const int regiontype, const int xy[2]) { LISTBASE_FOREACH (ARegion *, region, &screen->regionbase) { if (ELEM(regiontype, RGN_TYPE_ANY, region->regiontype)) { - if (BLI_rcti_isect_pt(®ion->winrct, x, y)) { + if (BLI_rcti_isect_pt_v(®ion->winrct, xy)) { return region; } } -- cgit v1.2.3