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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-01-04 06:07:45 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-01-04 06:19:00 +0300
commit9b655609343f5b42a7a26af57e09ed44d6c95656 (patch)
tree0ddf0282db7a89de11681664185e23857f62f23a /source
parent25418be97e023f2b046d5ef7d4841b30c5eec059 (diff)
Fix T53637: Keymap from app-template ignored
Addon's were also ignored
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/blender.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index af46b6ec852..7a61ef2abac 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -243,7 +243,6 @@ void BKE_blender_userdef_data_free(UserDef *userdef, bool clear_fonts)
void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *userdef_b)
{
/* TODO:
- * - keymaps
* - various minor settings (add as needed).
*/
@@ -259,10 +258,6 @@ void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *use
SWAP(ListBase, userdef_a->id, userdef_b->id); \
} ((void)0)
- /* for some types we need custom free functions */
- LIST_SWAP(addons);
- LIST_SWAP(user_keymaps);
-
LIST_SWAP(uistyles);
LIST_SWAP(uifonts);
LIST_SWAP(themes);
@@ -273,6 +268,7 @@ void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *use
DATA_SWAP(font_path_ui);
DATA_SWAP(font_path_ui_mono);
+ DATA_SWAP(keyconfigstr);
#undef SWAP_TYPELESS
#undef LIST_SWAP