diff options
Diffstat (limited to 'source/blender/editors/interface/interface_region_popup.c')
| -rw-r--r-- | source/blender/editors/interface/interface_region_popup.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/interface/interface_region_popup.c b/source/blender/editors/interface/interface_region_popup.c index e6381fd08e6..a51558e4cfe 100644 --- a/source/blender/editors/interface/interface_region_popup.c +++ b/source/blender/editors/interface/interface_region_popup.c @@ -530,23 +530,23 @@ static void ui_popup_block_remove(bContext *C, uiPopupBlockHandle *handle) wmWindowManager *wm = CTX_wm_manager(C); wmWindow *win = ctx_win; - bScreen *sc = CTX_wm_screen(C); + bScreen *screen = CTX_wm_screen(C); /* There may actually be a different window active than the one showing the popup, so lookup real * one. */ - if (BLI_findindex(&sc->regionbase, handle->region) == -1) { + if (BLI_findindex(&screen->regionbase, handle->region) == -1) { for (win = wm->windows.first; win; win = win->next) { - sc = WM_window_get_active_screen(win); - if (BLI_findindex(&sc->regionbase, handle->region) != -1) { + screen = WM_window_get_active_screen(win); + if (BLI_findindex(&screen->regionbase, handle->region) != -1) { break; } } } - BLI_assert(win && sc); + BLI_assert(win && screen); CTX_wm_window_set(C, win); - ui_region_temp_remove(C, sc, handle->region); + ui_region_temp_remove(C, screen, handle->region); /* Reset context (area and region were NULL'ed when chaning context window). */ CTX_wm_window_set(C, ctx_win); @@ -554,7 +554,7 @@ static void ui_popup_block_remove(bContext *C, uiPopupBlockHandle *handle) CTX_wm_region_set(C, ctx_region); /* reset to region cursor (only if there's not another menu open) */ - if (BLI_listbase_is_empty(&sc->regionbase)) { + if (BLI_listbase_is_empty(&screen->regionbase)) { win->tag_cursor_refresh = true; } |