diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-04 12:36:50 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-04 12:36:50 +0300 |
| commit | 5a6a819b5d896da6a528615bce069d6ee9d9c85c (patch) | |
| tree | bdbdc6f742ddda3f063df4655933d736a1644eef /source/blender/blenkernel/intern/blender.c | |
| parent | 727aab5af414ed774226fa5ee77aeef2ca61b520 (diff) | |
| parent | 457dc8d12ca79247349aa3e76457a9f45e73026e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/blender.c')
| -rw-r--r-- | source/blender/blenkernel/intern/blender.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 60dad141e0b..0b368df57ed 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -247,7 +247,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). */ @@ -263,10 +262,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); @@ -277,6 +272,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); DATA_SWAP(manipulator_flag); |