Drag and drop 2.5 integration! Finally, slashdot regulars can use

[blender-staging.git] / source / blender / editors / space_file / filelist.c

diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 7ccaa6e278902c56a6d30a9aa8add212b52df923..dbe9417fd2aed6941c268f4b1f92c50ee4bf385a 100644 (file)
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -440,18 +440,36 @@ int folderlist_clear_next(struct SpaceFile *sfile)
        return 1;
 }
 
+/* not listbase itself */
 void folderlist_free(ListBase* folderlist)
 {
        FolderList *folder;
        if (folderlist){
-               for(folder= folderlist->last; folder; folder= folderlist->last) {
-                               MEM_freeN(folder->foldername);
-                               BLI_freelinkN(folderlist, folder);
-               }
+               for(folder= folderlist->first; folder; folder= folder->next)
+                       MEM_freeN(folder->foldername);
+               BLI_freelistN(folderlist);
        }
        folderlist= NULL;
 }
 
+ListBase *folderlist_duplicate(ListBase* folderlist)
+{
+       
+       if (folderlist) {
+               ListBase *folderlistn= MEM_callocN(sizeof(ListBase), "copy folderlist");
+               FolderList *folder;
+               
+               BLI_duplicatelist(folderlistn, folderlist);
+               
+               for(folder= folderlistn->first; folder; folder= folder->next) {
+                       folder->foldername= MEM_dupallocN(folder->foldername);
+               }
+               return folderlistn;
+       }
+       return NULL;
+}
+
+
 static void filelist_read_main(struct FileList* filelist);
 static void filelist_read_library(struct FileList* filelist);
 static void filelist_read_dir(struct FileList* filelist);
@@ -499,6 +517,8 @@ void filelist_free(struct FileList* filelist)
                filelist->filelist[i].image = 0;
                if (filelist->filelist[i].relname)
                        MEM_freeN(filelist->filelist[i].relname);
+               if (filelist->filelist[i].path)
+                       MEM_freeN(filelist->filelist[i].path);
                filelist->filelist[i].relname = 0;
                if (filelist->filelist[i].string)
                        MEM_freeN(filelist->filelist[i].string);