Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2018-05-23 13:06:38 +0300
committerJulian Eisel <eiseljulian@gmail.com>2018-05-23 13:06:38 +0300
commit909d548d56f13a7b86d2859ce985f88e9b14921d (patch)
tree3b0c02ad1e35ee4022baa81f83c1f5499223ad20 /source/blender/editors/screen
parent5667822876cb67237122bbd178f17667876bea66 (diff)
Fix T55072: Top bar disappears when loading factory settings (causing ASAN crash)
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r--source/blender/editors/screen/screen_edit.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 10db5e4aea5..4208f3f6233 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -802,13 +802,15 @@ void ED_screen_refresh(wmWindowManager *wm, wmWindow *win)
/* exception for bg mode, we only need the screen context */
if (!G.background) {
+ WM_window_set_dpi(win);
+
+ /* Get window pixels __after__ updating window DPI! */
const int window_size_x = WM_window_pixels_x(win);
const int window_size_y = WM_window_pixels_y(win);
const int screen_size_x = WM_window_screen_pixels_x(win);
const int screen_size_y = WM_window_screen_pixels_y(win);
/* header size depends on DPI, let's verify */
- WM_window_set_dpi(win);
screen_refresh_headersizes();
screen_vertices_scale(win, screen, window_size_x, window_size_y, screen_size_x, screen_size_y);