Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for previous commit, sorry for the noise.

Browse Source
This commit is contained in:
Bastien Montagne
2015-02-15 15:55:13 +01:00
parent 2e9105cc96
commit f1ee11fcca
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/space_file/filelist.c
View File

@@ -1102,7 +1102,7 @@ static void filelist_from_library(struct FileList *filelist)
} }
filelist->numfiles = nnames + 1; filelist->numfiles = nnames + 1;
filelist->filelist = malloc(filelist->numfiles * sizeof(*filelist->filelist)); filelist->filelist = MEM_mallocN(filelist->numfiles * sizeof(*filelist->filelist), __func__);
memset(filelist->filelist, 0, filelist->numfiles * sizeof(*filelist->filelist)); memset(filelist->filelist, 0, filelist->numfiles * sizeof(*filelist->filelist));
filelist->filelist[0].relname = BLI_strdup(FILENAME_PARENT); filelist->filelist[0].relname = BLI_strdup(FILENAME_PARENT);
@@ -1173,7 +1173,7 @@ static void filelist_from_main(struct FileList *filelist)
#else #else
filelist->numfiles = 23; filelist->numfiles = 23;
#endif #endif
filelist->filelist = (struct direntry *)malloc(filelist->numfiles * sizeof(struct direntry)); filelist->filelist = (struct direntry *)MEM_mallocN(filelist->numfiles * sizeof(struct direntry), __func__);
for (a = 0; a < filelist->numfiles; a++) { for (a = 0; a < filelist->numfiles; a++) {
memset(&(filelist->filelist[a]), 0, sizeof(struct direntry)); memset(&(filelist->filelist[a]), 0, sizeof(struct direntry));
@@ -1227,7 +1227,7 @@ static void filelist_from_main(struct FileList *filelist)
/* XXXXX TODO: if databrowse F4 or append/link filelist->hide_parent has to be set */ /* XXXXX TODO: if databrowse F4 or append/link filelist->hide_parent has to be set */
if (!filelist->filter_data.hide_parent) filelist->numfiles += 1; if (!filelist->filter_data.hide_parent) filelist->numfiles += 1;
filelist->filelist = filelist->numfiles > 0 ? (struct direntry *)malloc(filelist->numfiles * sizeof(struct direntry)) : NULL; filelist->filelist = filelist->numfiles > 0 ? (struct direntry *)MEM_mallocN(filelist->numfiles * sizeof(struct direntry), __func__) : NULL;
files = filelist->filelist; files = filelist->filelist;