[Bf-blender-cvs] [8c484d0bda2] blender-v2.79a-release: Fix T53637: Keymap from app-template ignored
Campbell Barton
noreply at git.blender.org
Fri Jan 5 00:19:31 CET 2018
Commit: 8c484d0bda273b540997e935e618246c0e991e1d
Author: Campbell Barton
Date: Thu Jan 4 14:07:45 2018 +1100
Branches: blender-v2.79a-release
https://developer.blender.org/rB8c484d0bda273b540997e935e618246c0e991e1d
Fix T53637: Keymap from app-template ignored
Addon's were also ignored
===================================================================
M source/blender/blenkernel/intern/blender.c
===================================================================
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
More information about the Bf-blender-cvs
mailing list