diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-12 04:00:21 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-12 04:00:21 +0400 |
commit | 2827ee26e5fafbb76b1cc4f63e5feaca513cd4a9 (patch) | |
tree | 843cc384fd7401df88ef0523c19dc63865f3223c /source/blender/editors/space_file/filelist.c | |
parent | 8f9fa6a400d0a3e38206532c17d8bb00f0ceb51e (diff) |
fix for ntreeGPUMaterialNodes(), using uninitialized exec pointer.
also commented some set-but-unused variables.
Diffstat (limited to 'source/blender/editors/space_file/filelist.c')
-rw-r--r-- | source/blender/editors/space_file/filelist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index 7382188d62a..c7ada4a5801 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -1158,8 +1158,8 @@ void filelist_from_main(struct FileList *filelist) /* XXXXX TODO: if databrowse F4 or append/link filelist->hide_parent has to be set */ if (!filelist->hide_parent) filelist->numfiles+= 1; - filelist->filelist= (struct direntry *)malloc(filelist->numfiles * sizeof(struct direntry)); - + filelist->filelist= filelist->numfiles > 0 ? (struct direntry *)malloc(filelist->numfiles * sizeof(struct direntry)) : NULL; + files = filelist->filelist; if (!filelist->hide_parent) { |