diff options
| author | Andrea Weikert <elubie@gmx.net> | 2010-03-15 23:28:13 +0300 |
|---|---|---|
| committer | Andrea Weikert <elubie@gmx.net> | 2010-03-15 23:28:13 +0300 |
| commit | 8fdb4d45063f01be975cf3c6351607115a0b8d4e (patch) | |
| tree | d23e627f659b2718de89f442c167b37e838a26d6 /source/blender/editors/space_file/filesel.c | |
| parent | ae6ee27d37f94a5c26cdf6060d71c5b6bc209a0e (diff) | |
Fix [#21618] Wrong Icon For BLEND file on File/Append
While the folder icon was originally planned when in append/link mode, it's easier to distinguish with a blender icon, so the folder icon is now replaced.
Also fixed issue introduced in rev. 27491 where filter settings were incorrectly set when moving out of .blend file again.
Diffstat (limited to 'source/blender/editors/space_file/filesel.c')
| -rw-r--r-- | source/blender/editors/space_file/filesel.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index 758740e676a..6945e8c959a 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -194,7 +194,7 @@ short ED_fileselect_set_params(SpaceFile *sfile) params->filter = 0; params->sort = FILE_SORT_ALPHA; } - + params->oldflag = params->flag; return 1; } @@ -414,6 +414,9 @@ void file_change_dir(bContext *C, int checkdir) char dir[FILE_MAX]; if (filelist_islibrary(sfile->files, dir, group)) { sfile->params->flag &= ~FILE_FILTER; + } else { + /* reset the old flag */ + sfile->params->flag = sfile->params->oldflag; } } if(folderlist_clear_next(sfile)) |