Cycles: svn merge -r41182:41205 ^/trunk/blender
[blender-staging.git] / source / blender / editors / interface / interface_icons.c
index 5059b9d66b1d669df4caba94737ac80215263a4a..90349f8f255dc80fcba5ebeccbfdf0f2819043c8 100644 (file)
@@ -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<totfile; i++) {
@@ -662,7 +661,7 @@ static void init_iconfile_list(struct ListBase *list)
                }
        }
        
-       /* free temporary direntry structure that's been created by BLI_getdir() */
+       /* free temporary direntry structure that's been created by BLI_dir_contents() */
        i= totfile-1;
        
        for(; i>=0; i--){