diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-08-01 22:06:58 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-08-01 22:06:58 +0300 |
| commit | 4ade467fc6adfc13ce9e21d7e50b366fce70ea5f (patch) | |
| tree | 968418721b08baacd47bab95877bc08812f3046a /source/blender/editors/space_file/filelist.c | |
| parent | 7759782ee7c4e654641c9f7abb51631c86e3f29c (diff) | |
| parent | a3c5de3e3ca82d8ad5a28029f3ee9207929318a1 (diff) | |
Merge branch 'master' into UI-graphical-redesign
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_userdef_types.h
Diffstat (limited to 'source/blender/editors/space_file/filelist.c')
| -rw-r--r-- | source/blender/editors/space_file/filelist.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 4048c9fc1a1..3358812796e 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -1252,8 +1252,9 @@ static void filelist_from_main(struct FileList *filelist) files->relname = BLI_strdup(id->name + 2); } else { - files->relname = MEM_mallocN(sizeof(*files->relname) * (FILE_MAX + (MAX_ID_NAME - 2)), __func__); - BLI_snprintf(files->relname, FILE_MAX + (MAX_ID_NAME - 2) + 3, "%s | %s", id->lib->name, id->name + 2); + char relname[FILE_MAX + (MAX_ID_NAME - 2) + 3]; + BLI_snprintf(relname, sizeof(relname), "%s | %s", id->lib->name, id->name + 2); + files->relname = BLI_strdup(relname); } files->type |= S_IFREG; #if 0 /* XXXXX TODO show the selection status of the objects */ |