blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Campbell Barton 2020-05-05 13:47:05 +10:00
parent 75be3bc4b9 d8133b3eb9
commit 9b8e0c6d0f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/windowmanager/intern/wm_window.c
View File

@ -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);