diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-04-30 20:44:00 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-04-30 20:44:00 +0400 |
| commit | 3ee6c11e31dcebc0999e335818cc07520dff5389 (patch) | |
| tree | 7e96b0e2b5385df6be6012e9c78d071d18128a9a /source/blender/blenkernel/intern | |
| parent | 140a60539bb03d4f843e6d6f5aa47e7d726b0971 (diff) | |
2.5
Two fixes:
- objects in editmode now update data on saving .blend
- uifonts and uistyles were not freed yet on reading files
yet.
Diffstat (limited to 'source/blender/blenkernel/intern')
| -rw-r--r-- | source/blender/blenkernel/intern/blender.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 2033250585d..3169905b7f5 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -325,8 +325,8 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, char *filename) if (bfd->user) { /* only here free userdef themes... */ - BLI_freelistN(&U.themes); - + BKE_userdef_free(); + U= *bfd->user; MEM_freeN(bfd->user); } @@ -414,6 +414,15 @@ static void handle_subversion_warning(Main *main) } +void BKE_userdef_free(void) +{ + + BLI_freelistN(&U.uistyles); + BLI_freelistN(&U.uifonts); + BLI_freelistN(&U.themes); + +} + /* returns: 0: no load file 1: OK |