Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-11-16 03:24:49 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-16 06:54:41 +0300
commitf54b239269f726be38da52052951bfb7cb9e7e0e (patch)
tree7688ea72776d1999fd8f6897830588cbdcce42d2 /source/blender/blenloader
parent77ff9a2006607893032f709090ea17b944f16aff (diff)
Keymap: add support for key-config preferences
This is needed for keymaps to define their own options, which can include left/right mouse select. This can also help to us to provide popular keymap tweaks as options, so users can easily fit blender to their workflow with well supported adjustments which don't give the overhead of having to maintain your own keymap, which become out-dated when operators change.
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c6
-rw-r--r--source/blender/blenloader/intern/writefile.c7
2 files changed, 13 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 4eea35ad89f..90deb0f37ea 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8914,6 +8914,7 @@ static BHead *read_userdef(BlendFileData *bfd, FileData *fd, BHead *bhead)
link_list(fd, &user->themes);
link_list(fd, &user->user_keymaps);
+ link_list(fd, &user->user_keyconfig_prefs);
link_list(fd, &user->user_menus);
link_list(fd, &user->addons);
link_list(fd, &user->autoexec_paths);
@@ -8940,6 +8941,11 @@ static BHead *read_userdef(BlendFileData *bfd, FileData *fd, BHead *bhead)
direct_link_keymapitem(fd, kmi);
}
+ for (wmKeyConfigPrefType *kpt = user->user_keyconfig_prefs.first; kpt; kpt = kpt->next) {
+ kpt->prop = newdataadr(fd, kpt->prop);
+ IDP_DirectLinkGroup_OrFree(&kpt->prop, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
+ }
+
for (bUserMenu *um = user->user_menus.first; um; um = um->next) {
link_list(fd, &um->items);
for (bUserMenuItem *umi = um->items.first; umi; umi = umi->next) {
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index fd097927f57..3d4edc2e4da 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1248,6 +1248,13 @@ static void write_userdef(WriteData *wd, const UserDef *userdef)
}
}
+ for (const wmKeyConfigPrefType *kpt = userdef->user_keyconfig_prefs.first; kpt; kpt = kpt->next) {
+ writestruct(wd, DATA, wmKeyConfigPrefType, 1, kpt);
+ if (kpt->prop) {
+ IDP_WriteProperty(kpt->prop, wd);
+ }
+ }
+
for (const bUserMenu *um = userdef->user_menus.first; um; um = um->next) {
writestruct(wd, DATA, bUserMenu, 1, um);
for (const bUserMenuItem *umi = um->items.first; umi; umi = umi->next) {