[Bf-blender-cvs] [601eafd104c] master: Fix T72118: Enable Windows 10 Non-client DPI Scaling

[Harley Acheson]

Commit: 601eafd104ca66e3baaa45e9ecb00989395c55d9
Author: Harley Acheson
Date:   Thu Dec 5 16:50:30 2019 -0800
Branches: master
https://developer.blender.org/rB601eafd104ca66e3baaa45e9ecb00989395c55d9

Fix T72118: Enable Windows 10 Non-client DPI Scaling

Enables Windows 10 feature that automatically adjusts non-client area (title bar) on high-DPI displays.

Differential Revision: https://developer.blender.org/D6370

Reviewed by Brecht Van Lommel

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

M	intern/ghost/intern/GHOST_SystemWin32.cpp
M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib

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

diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 323722173d4..79e38de414f 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -1156,9 +1156,8 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
   GHOST_ASSERT(system, "GHOST_SystemWin32::s_wndProc(): system not initialized");
 
   if (hwnd) {
-#if 0
-    // Disabled due to bug in Intel drivers, see T51959
-    if (msg == WM_NCCREATE) {
+
+	  if (msg == WM_NCCREATE) {
       // Tell Windows to automatically handle scaling of non-client areas
       // such as the caption bar. EnableNonClientDpiScaling was introduced in Windows 10
       HMODULE m_user32 = ::LoadLibrary("User32.dll");
@@ -1166,13 +1165,11 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
         GHOST_WIN32_EnableNonClientDpiScaling fpEnableNonClientDpiScaling =
             (GHOST_WIN32_EnableNonClientDpiScaling)::GetProcAddress(m_user32,
                                                                     "EnableNonClientDpiScaling");
-
         if (fpEnableNonClientDpiScaling) {
           fpEnableNonClientDpiScaling(hwnd);
         }
       }
     }
-#endif
 
     GHOST_WindowWin32 *window = (GHOST_WindowWin32 *)::GetWindowLongPtr(hwnd, GWLP_USERDATA);
     if (window) {
diff --git a/release/datafiles/locale b/release/datafiles/locale
index a2fb7b56b6c..b0b6396312e 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit a2fb7b56b6c99ca14aa1dd09659ad0242c1b1589
+Subproject commit b0b6396312e7ceb78826d423f8f152ddba01c039
diff --git a/release/scripts/addons b/release/scripts/addons
index 52b58daa975..2f425cc128b 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 52b58daa9759d56e45aa6dabd90ec36910e7084a
+Subproject commit 2f425cc128b8b709cc1ebf2c96ad372778f4aeda
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index af1d8170e6f..b52e7760ff6 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit af1d8170e6fb19851fd547fe228bceede3375bfe
+Subproject commit b52e7760ff6ccbcca73d2bbccc77f70ca2eaf98f