[Bf-blender-cvs] [69397fee48] app-templates: Use keymap from template prefs

[Campbell Barton]

Commit: 69397fee48c32fdd249ccf71684a30506ebbeb12
Author: Campbell Barton
Date:   Fri Mar 24 11:23:46 2017 +1100
Branches: app-templates
https://developer.blender.org/rB69397fee48c32fdd249ccf71684a30506ebbeb12

Use keymap from template prefs

===================================================================

M	source/blender/blenkernel/BKE_blender.h
M	source/blender/blenkernel/intern/blender.c
M	source/blender/windowmanager/intern/wm_files.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index d89f9b28c6..d55926ffb1 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -52,7 +52,7 @@ void BKE_blender_userdef_set_data(struct UserDef *userdef);
 void BKE_blender_userdef_free_data(struct UserDef *userdef);
 void BKE_blender_userdef_refresh(void);
 
-void BKE_blender_userdef_set_template(struct UserDef *userdef);
+void BKE_blender_userdef_set_app_template(struct UserDef *userdef);
 
 /* set this callback when a UI is running */
 void BKE_blender_callback_test_break_set(void (*func)(void));
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index ce3b623002..ceb641073e 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -242,7 +242,7 @@ void BKE_blender_userdef_refresh(void)
  * Write U from userdef.
  * This function defines which settings a template will override for the user preferences.
  */
-void BKE_blender_userdef_set_template(UserDef *userdef)
+void BKE_blender_userdef_set_app_template(UserDef *userdef)
 {
 	/* TODO:
 	 * - keymaps
@@ -259,11 +259,13 @@ void BKE_blender_userdef_set_template(UserDef *userdef)
 
 	/* for some types we need custom free functions */
 	userdef_free_addons(&U);
+	userdef_free_keymaps(&U);
 
 	LIST_OVERRIDE(uistyles);
 	LIST_OVERRIDE(uifonts);
 	LIST_OVERRIDE(themes);
 	LIST_OVERRIDE(addons);
+	LIST_OVERRIDE(user_keymaps);
 
 	MEMCPY_OVERRIDE(light);
 
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 82ded46317..5a9543bc1d 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -790,7 +790,7 @@ int wm_homefile_read(
 					datatoc_startup_blend, datatoc_startup_blend_size, NULL);
 		}
 		if (userdef_template) {
-			BKE_blender_userdef_set_template(userdef_template);
+			BKE_blender_userdef_set_app_template(userdef_template);
 			BKE_blender_userdef_free_data(userdef_template);
 			MEM_freeN(userdef_template);
 		}