diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-03-12 18:15:40 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-12 18:15:40 +0300 |
commit | a5e59ede6e275d89fb74ab2e2ae1ee581e08356b (patch) | |
tree | 16f9ff2f605108147d1ef2c88975f4c93b419408 /source/blender/editors/space_file | |
parent | f6b21ecf840627f384c84e1a869ca54698792a87 (diff) |
pass report list along to BLO_blendhandle_from_file(), avoid unlikely crash in the append operator.
Diffstat (limited to 'source/blender/editors/space_file')
-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 0eee8eb0712..42efa5d4a3b 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -986,7 +986,7 @@ void filelist_from_library(struct FileList* filelist) /* there we go */ /* for the time being only read filedata when libfiledata==0 */ if (filelist->libfiledata == NULL) { - filelist->libfiledata= BLO_blendhandle_from_file(dir); + filelist->libfiledata= BLO_blendhandle_from_file(dir, NULL); if(filelist->libfiledata == NULL) return; } @@ -1000,7 +1000,7 @@ void filelist_from_library(struct FileList* filelist) names= BLO_blendhandle_get_datablock_names(filelist->libfiledata, idcode, &nnames); /* ugh, no rewind, need to reopen */ BLO_blendhandle_close(filelist->libfiledata); - filelist->libfiledata= BLO_blendhandle_from_file(dir); + filelist->libfiledata= BLO_blendhandle_from_file(dir, NULL); } else { names= BLO_blendhandle_get_linkable_groups(filelist->libfiledata); |