From e417e011d558693b9ff9cd048efe9cbe79da74be Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 22 Oct 2011 15:35:49 +0000 Subject: Code cleanup: file operations merged into single header, some function names made less cryptic and changed to indicate if they work on files or directories. --- source/blender/editors/interface/interface_icons.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'source/blender/editors/interface/interface_icons.c') diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index c1418c5b6e8..f987aa9c4e6 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -47,7 +47,6 @@ #include "BLI_math.h" #include "BLI_blenlib.h" -#include "BLI_storage_types.h" #include "BLI_utildefines.h" #include "DNA_brush_types.h" @@ -609,11 +608,11 @@ static void init_iconfile_list(struct ListBase *list) if(icondir==NULL) return; - /* since BLI_getdir changes the current working directory, restore it + /* since BLI_dir_contents changes the current working directory, restore it back to old value afterwards */ - if(!BLI_getwdN(olddir, sizeof(olddir))) + if(!BLI_current_working_dir(olddir, sizeof(olddir))) restoredir = 0; - totfile = BLI_getdir(icondir, &dir); + totfile = BLI_dir_contents(icondir, &dir); if (restoredir && !chdir(olddir)) {} /* fix warning about checking return value */ for(i=0; i=0; i--){ -- cgit v1.2.3