diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-05-05 06:47:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-05-05 06:47:05 +0300 |
| commit | 9b8e0c6d0f5c8a4520ce49b03a072d114e985a7c (patch) | |
| tree | 52ccbf5a2d0f44ff7d9a8a579f53477e91298369 /source/blender/windowmanager | |
| parent | 75be3bc4b940a9026a52be2024ec09b4dee4d937 (diff) | |
| parent | d8133b3eb99ac7ccc420d54a6a52a3f750e497ac (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 080c2ee26c2..b1eee7509b7 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -940,7 +940,8 @@ wmWindow *WM_window_open_temp(bContext *C, /* make window active, and validate/resize */ CTX_wm_window_set(C, win); - if (!win->ghostwin) { + const bool new_window = (win->ghostwin == NULL); + if (new_window) { wm_window_ghostwindow_ensure(wm, win, dialog); } WM_check(C); @@ -959,7 +960,7 @@ wmWindow *WM_window_open_temp(bContext *C, ED_screen_change(C, screen); - if (win->ghostwin) { + if (!new_window) { /* Set size in GHOST window and then update size and position from GHOST, * in case they where changed by GHOST to fit the monitor/screen. */ wm_window_set_size(win, win->sizex, win->sizey); |