diff options
author | Campbell Barton <campbell@blender.org> | 2022-08-30 14:07:31 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-08-30 14:07:31 +0300 |
commit | e0ab4b29a9c7dfc42751a524db9b948b0636b288 (patch) | |
tree | c2ae493029ebe50bc4b962cd6b58932a481c10c7 /source/blender/editors/screen | |
parent | c7555372feae3fcce179366faac5477a505b0a64 (diff) | |
parent | 524d9a3e2fa1821d0f846877ecb3936b7c3794dd (diff) |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 3618b933443..c069b3c6292 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -723,15 +723,16 @@ typedef struct sActionzoneData { static bool actionzone_area_poll(bContext *C) { wmWindow *win = CTX_wm_window(C); - bScreen *screen = WM_window_get_active_screen(win); - - if (screen && win && win->eventstate) { - const int *xy = &win->eventstate->xy[0]; + if (win && win->eventstate) { + bScreen *screen = WM_window_get_active_screen(win); + if (screen) { + const int *xy = &win->eventstate->xy[0]; - LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { - LISTBASE_FOREACH (AZone *, az, &area->actionzones) { - if (BLI_rcti_isect_pt_v(&az->rect, xy)) { - return true; + LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { + LISTBASE_FOREACH (AZone *, az, &area->actionzones) { + if (BLI_rcti_isect_pt_v(&az->rect, xy)) { + return true; + } } } } |