diff options
author | Andrea Weikert <elubie@gmx.net> | 2009-01-06 22:22:29 +0300 |
---|---|---|
committer | Andrea Weikert <elubie@gmx.net> | 2009-01-06 22:22:29 +0300 |
commit | fc28d3cf75abac6b84b72dcdd5581055dded692a (patch) | |
tree | eb69aadd1356fa170941f9827edc89c770de0385 /source/blender/editors/space_file/filesel.c | |
parent | 25e5765f47979484065c18eb1af010a8f23ddcf3 (diff) |
2.5 filebrowser
further cleanup:
- moved struct FileList* back to SpaceFile
- fix for memory related errors and freeing operator in file_free
- removed wmSubWindowSet, we're not doing OpenGL select in filebrowser
- removed drawing of load button when invoked from windowtype pupmenu
2.5 MSVC projectfiles:
- slipped in removal of multires_firstlevel.c in blenkernel
Diffstat (limited to 'source/blender/editors/space_file/filesel.c')
-rw-r--r-- | source/blender/editors/space_file/filesel.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index fade08992c9..404fddd9d48 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -104,7 +104,6 @@ short ED_fileselect_set_params(const struct bContext *C, int type, const char *t if (!sfile->params) { sfile->params = MEM_callocN(sizeof(FileSelectParams), "fileselparams"); - sfile->params->files = filelist_new(); } params = sfile->params; @@ -132,14 +131,14 @@ short ED_fileselect_set_params(const struct bContext *C, int type, const char *t BLI_strncpy(params->dir, dir, sizeof(params->dir)); BLI_make_file_string(G.sce, params->dir, dir, ""); /* XXX needed ? - also solve G.sce */ - filelist_settype(params->files, type); - filelist_setdir(params->files, params->dir); + filelist_settype(sfile->files, type); + filelist_setdir(sfile->files, params->dir); BLI_cleanup_dir(G.sce, params->dir); /* XXX solve G.sce */ /* free: filelist and libfiledata became incorrect */ - if (params->files) { - filelist_free(params->files); - filelist_freelib(params->files); + if (sfile->files) { + filelist_free(sfile->files); + filelist_freelib(sfile->files); } } break; |