[Bf-blender-cvs] [9a5acdf799] app-templates: Minor API changes

[Campbell Barton]

Commit: 9a5acdf79988dc73241e3ebf2b7eec04a9df11c8
Author: Campbell Barton
Date:   Fri Mar 17 02:39:57 2017 +1100
Branches: app-templates
https://developer.blender.org/rB9a5acdf79988dc73241e3ebf2b7eec04a9df11c8

Minor API changes

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

M	source/blender/blenkernel/BKE_blender.h
M	source/blender/blenkernel/BKE_blendfile.h
M	source/blender/blenkernel/intern/blender.c
M	source/blender/blenkernel/intern/blendfile.c
M	source/blender/windowmanager/intern/wm_init_exit.c

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

diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index 040df054ec..4bf2e31e5e 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -48,7 +48,7 @@ void BKE_blender_version_string(
         char *version_str, size_t maxncpy,
         short version, short subversion, bool v_prefix, bool include_subversion);
 
-void BKE_blender_userdef_free(struct UserDef *userdef);
+void BKE_blender_userdef_free_data(struct UserDef *userdef);
 void BKE_blender_userdef_refresh(void);
 	
 /* set this callback when a UI is running */
diff --git a/source/blender/blenkernel/BKE_blendfile.h b/source/blender/blenkernel/BKE_blendfile.h
index 7d1825506e..df33f9cb90 100644
--- a/source/blender/blenkernel/BKE_blendfile.h
+++ b/source/blender/blenkernel/BKE_blendfile.h
@@ -51,7 +51,7 @@ bool BKE_blendfile_read_from_memfile(
         struct bContext *C, struct MemFile *memfile,
         struct ReportList *reports, int skip_flag);
 
-void            BKE_blendfile_userdef_assign(struct UserDef *userdef);
+void            BKE_blendfile_userdef_set(struct UserDef *userdef);
 struct UserDef *BKE_blendfile_userdef_read(const char *filepath, struct ReportList *reports);
 int             BKE_blendfile_userdef_write(const char *filepath, struct ReportList *reports);
 
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 0180e68fae..27784ea25f 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -154,7 +154,7 @@ static void keymap_item_free(wmKeyMapItem *kmi)
  * When loading a new userdef from file,
  * or when exiting Blender.
  */
-void BKE_blender_userdef_free(UserDef *userdef)
+void BKE_blender_userdef_free_data(UserDef *userdef)
 {
 #define U _invalid_access_ /* ensure no accidental global access */
 #ifdef U  /* quiet warning */
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index c254311c17..3e5a5a675a 100644
--- a/source/blender/blenkernel/intern/blendfile.c
+++ b/source/blender/blenkernel/intern/blendfile.c
@@ -227,7 +227,7 @@ static void setup_app_data(
 	if (bfd->user) {
 
 		/* only here free userdef themes... */
-		BKE_blender_userdef_free(&U);
+		BKE_blender_userdef_free_data(&U);
 
 		U = *bfd->user;
 
@@ -424,10 +424,10 @@ bool BKE_blendfile_read_from_memfile(
 	return (bfd != NULL);
 }
 
-void BKE_blendfile_userdef_assign(UserDef *userdef)
+void BKE_blendfile_userdef_set(UserDef *userdef)
 {
 	/* only here free userdef themes... */
-	BKE_blender_userdef_free(&U);
+	BKE_blender_userdef_free_data(&U);
 	U = *userdef;
 	MEM_freeN(userdef);
 }
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 368e8a2c10..5483cf25e4 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -572,7 +572,7 @@ void WM_exit_ext(bContext *C, const bool do_python)
 	ED_file_exit(); /* for fsmenu */
 
 	UI_exit();
-	BKE_blender_userdef_free(&U);
+	BKE_blender_userdef_free_data(&U);
 
 	RNA_exit(); /* should be after BPY_python_end so struct python slots are cleared */