diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-20 20:39:22 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-20 20:57:11 +0400 |
| commit | 163e544006ffb7224afdce083c41eb0698b0be15 (patch) | |
| tree | ba9c14096c9ed05237f53f1d7949416393d72843 /source/blender/editors/space_file/space_file.c | |
| parent | aec90a8fafe19dfad110d9473d3f70e3aeeb8771 (diff) | |
Fix bookmarks not appearing in file browser after "copy previous settings".
Diffstat (limited to 'source/blender/editors/space_file/space_file.c')
| -rw-r--r-- | source/blender/editors/space_file/space_file.c | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index 62048752fa1..170e9336fea 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -637,16 +637,8 @@ void ED_spacetype_file(void) void ED_file_init(void) { - const char * const cfgdir = BLI_get_folder(BLENDER_USER_CONFIG, NULL); - - fsmenu_read_system(fsmenu_get(), TRUE); + ED_file_read_bookmarks(); - if (cfgdir) { - char name[FILE_MAX]; - BLI_make_file_string("/", name, cfgdir, BLENDER_BOOKMARK_FILE); - fsmenu_read_bookmarks(fsmenu_get(), name); - } - if (G.background == FALSE) { filelist_init_icons(); } @@ -656,9 +648,25 @@ void ED_file_init(void) void ED_file_exit(void) { - fsmenu_free(fsmenu_get()); + fsmenu_free(); if (G.background == FALSE) { filelist_free_icons(); } } + +void ED_file_read_bookmarks(void) +{ + const char * const cfgdir = BLI_get_folder(BLENDER_USER_CONFIG, NULL); + + fsmenu_free(); + + fsmenu_read_system(fsmenu_get(), TRUE); + + if (cfgdir) { + char name[FILE_MAX]; + BLI_make_file_string("/", name, cfgdir, BLENDER_BOOKMARK_FILE); + fsmenu_read_bookmarks(fsmenu_get(), name); + } +} + |