diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-16 21:10:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-16 21:20:50 +0300 |
| commit | b2d3956e7b497bd6d5467113bfd76614f5188ae0 (patch) | |
| tree | 6aaaf5d77d50cf30762383dd4befede9db741d50 /source/blender/blenkernel/intern/blender.c | |
| parent | db04980678ae8b2a2b3cd07bfdefa86af5c53f82 (diff) | |
Add support for loading preference struct
Previously it would always load into 'U' global.
Needed for loading & merging template preferences.
Diffstat (limited to 'source/blender/blenkernel/intern/blender.c')
| -rw-r--r-- | source/blender/blenkernel/intern/blender.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 0180e68faed..1febeebf9ea 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -150,11 +150,18 @@ static void keymap_item_free(wmKeyMapItem *kmi) MEM_freeN(kmi->ptr); } +void BKE_blender_userdef_set_data(UserDef *userdef) +{ + /* only here free userdef themes... */ + BKE_blender_userdef_free_data(&U); + U = *userdef; +} + /** * 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 */ |