diff options
| author | Germano Cavalcante <germano.costa@ig.com.br> | 2022-03-02 00:25:59 +0300 |
|---|---|---|
| committer | Germano Cavalcante <germano.costa@ig.com.br> | 2022-03-02 00:35:48 +0300 |
| commit | bfe37b7255e76b7c66e3f9cfd47bd0636ac142cf (patch) | |
| tree | 2bcb56940efd532d7bcd8ac0b3fb67e466f4ffee /source/blender/editors/screen | |
| parent | e1ec2d025142a35ce5a5302da0b9a71a279c61f2 (diff) | |
| parent | 9bd586a01e6813a615eab05871803730603e2152 (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/area.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index a64948b5864..af84f6f99a9 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -3442,7 +3442,6 @@ ScrArea *ED_area_find_under_cursor(const bContext *C, int spacetype, const int x { bScreen *screen = CTX_wm_screen(C); wmWindow *win = CTX_wm_window(C); - wmWindowManager *wm = CTX_wm_manager(C); ScrArea *area = NULL; @@ -3454,8 +3453,8 @@ ScrArea *ED_area_find_under_cursor(const bContext *C, int spacetype, const int x if (!area) { /* Check all windows except the active one. */ int scr_pos[2]; - wmWindow *r_win = WM_window_find_under_cursor(wm, win, win, xy, scr_pos); - if (r_win) { + wmWindow *r_win = WM_window_find_under_cursor(win, xy, scr_pos); + if (r_win && r_win != win) { win = r_win; screen = WM_window_get_active_screen(win); area = BKE_screen_find_area_xy(screen, spacetype, scr_pos); |