From d478cc71dd73691b8e482911df42c71aaa85de8c Mon Sep 17 00:00:00 2001
From: Miguel Pozo <pragma37>
Date: Wed, 8 Apr 2020 12:16:43 +0200
Subject: Fix Windows Tablet API preference not being used

It was sometimes set before reading preferences, now it's passed to GHOST every
time preferences are read.

Differential Revision: https://developer.blender.org/D5641
---
 source/blender/windowmanager/intern/wm_files.c  | 3 +++
 source/blender/windowmanager/intern/wm_window.c | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'source/blender/windowmanager')

diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 8af83aac1be..f2050befac1 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -375,6 +375,9 @@ static void wm_init_userdef(Main *bmain)
 
   /* update tempdir from user preferences */
   BKE_tempdir_init(U.tempdir);
+
+  /* Update tablet API preference. */
+  WM_init_tablet_api();
 }
 
 /* return codes */
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index a83432e0248..1e25d73a86d 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -1679,8 +1679,6 @@ void wm_ghost_init(bContext *C)
     }
 
     GHOST_UseWindowFocus(wm_init_state.window_focus);
-
-    WM_init_tablet_api();
   }
 }
 
-- 
cgit v1.2.3