[Bf-blender-cvs] [909d548d56f] blender2.8: Fix T55072: Top bar disappears when loading factory settings (causing ASAN crash)

Julian Eisel noreply at git.blender.org
Wed May 23 12:08:34 CEST 2018


Commit: 909d548d56f13a7b86d2859ce985f88e9b14921d
Author: Julian Eisel
Date:   Wed May 23 12:06:38 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB909d548d56f13a7b86d2859ce985f88e9b14921d

Fix T55072: Top bar disappears when loading factory settings (causing ASAN crash)

===================================================================

M	source/blender/editors/screen/screen_edit.c

===================================================================

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



More information about the Bf-blender-cvs mailing list