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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-03-16 16:18:20 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-03-16 16:18:20 +0300
commitaad9dd2f1bc2645885da4975985f413706b06c2e (patch)
tree46f2698e99a3b27de06428bc220f48b90331685d /source/blender/blenkernel/intern/blendfile.c
parent1cad64900e3f052fa895a4ac2a994d87b0c3fce1 (diff)
Support passing in UserDef for free function
Needed so we can load and free non-global user preferences.
Diffstat (limited to 'source/blender/blenkernel/intern/blendfile.c')
-rw-r--r--source/blender/blenkernel/intern/blendfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c
index 354f392528f..8b472249939 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();
+ BKE_blender_userdef_free(&U);
U = *bfd->user;
@@ -436,7 +436,7 @@ int BKE_blendfile_read_userdef(const char *filepath, ReportList *reports)
retval = BKE_BLENDFILE_READ_OK_USERPREFS;
/* only here free userdef themes... */
- BKE_blender_userdef_free();
+ BKE_blender_userdef_free(&U);
U = *bfd->user;
MEM_freeN(bfd->user);