diff options
| author | Miguel Pozo <pragma37> | 2020-04-08 13:16:43 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-04-08 13:25:40 +0300 |
| commit | d478cc71dd73691b8e482911df42c71aaa85de8c (patch) | |
| tree | eeac62bbae08ffe708adb0c553b25c249aa13a04 | |
| parent | a3c16055819f7236d0265dfa687f45031ee1b798 (diff) | |
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
| m--------- | release/scripts/addons | 0 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 3 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 8e6f485cf5b160c425d7da7c743879b20f3d6a9 +Subproject d348bde0f96809e289b0514c015cafb97f2dcf7 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(); } } |