griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Harley Acheson
2024-03-05 12:18:09 -08:00
parent bdba57e095 49c723e117
commit 77e84cb528
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/windowmanager/intern/wm_files.cc
View File

@@ -3858,6 +3858,11 @@ void wm_test_autorun_warning(bContext *C)
wmWindow *win = (wm->winactive) ? wm->winactive : static_cast<wmWindow *>(wm->windows.first);
if (win) {
/* We want this warning on the Main window, not a child window even if active. See #118765. */
if (win->parent) {
win = win->parent;
}
wmWindow *prevwin = CTX_wm_window(C);
CTX_wm_window_set(C, win);
UI_popup_block_invoke(C, block_create_autorun_warning, nullptr, nullptr);

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

@@ -2034,6 +2034,11 @@ void wm_test_opengl_deprecation_warning(bContext *C)
"Please contact the developer of the add-on to migrate to use 'gpu' module");
if (win) {
/* We want this warning on the Main window, not a child window even if active. See #118765. */
if (win->parent) {
win = win->parent;
}
wmWindow *prevwin = CTX_wm_window(C);
CTX_wm_window_set(C, win);
UI_popup_block_invoke(C, block_create_opengl_usage_warning, nullptr, nullptr);