[Bf-blender-cvs] [d478cc71dd7] master: Fix Windows Tablet API preference not being used
Miguel Pozo
noreply at git.blender.org
Wed Apr 8 12:28:21 CEST 2020
Commit: d478cc71dd73691b8e482911df42c71aaa85de8c
Author: Miguel Pozo
Date: Wed Apr 8 12:16:43 2020 +0200
Branches: master
https://developer.blender.org/rBd478cc71dd73691b8e482911df42c71aaa85de8c
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
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/release/scripts/addons b/release/scripts/addons
index 8e6f485cf5b..d348bde0f96 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 8e6f485cf5b160c425d7da7c743879b20f3d6a96
+Subproject commit d348bde0f96809e289b0514c015cafb97f2dcf79
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();
}
}
More information about the Bf-blender-cvs
mailing list