diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-03 16:15:56 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-03 16:15:56 +0300 |
| commit | 5884c9f1ba45b8285930508b8ee04279a7b0b387 (patch) | |
| tree | 11a71aea12aa2e4bf6121f21c041d0da7296928d /source/blender/windowmanager/intern | |
| parent | 3b6eaf8d96bce59756f669e0c5105ae3bb31bef8 (diff) | |
| parent | cc93a66e71a9de09cb41d4433be86e0f056d2b6f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/intern')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 59ba0b6182d..1095195acd5 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -809,7 +809,7 @@ int wm_homefile_read( if (userdef_template == NULL) { /* we need to have preferences load to overwrite preferences from previous template */ userdef_template = BKE_blendfile_userdef_read_from_memory( - datatoc_startup_blend, datatoc_startup_blend_size, NULL); + datatoc_startup_blend, datatoc_startup_blend_size, NULL); } if (userdef_template) { BKE_blender_userdef_set_app_template(userdef_template); diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 151c21d3cdd..2027afef103 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -421,7 +421,7 @@ static void wm_window_set_dpi(wmWindow *win) /* Blender's UI drawing assumes DPI 72 as a good default following macOS * while Windows and Linux use DPI 96. GHOST assumes a default 96 so we * remap the DPI to Blender's convention. */ - int dpi = auto_dpi * U.ui_scale * (72.0/96.0f); + int dpi = auto_dpi * U.ui_scale * (72.0 / 96.0f); /* Automatically set larger pixel size for high DPI. */ int pixelsize = MAX2(1, dpi / 54); |