diff options
author | Matt Ebb <matt@mke3.net> | 2010-03-29 12:33:35 +0400 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2010-03-29 12:33:35 +0400 |
commit | 9a99b7d193cb02c6c0cb9d7fde71193fd3f17529 (patch) | |
tree | b00177e0189c5cba125159cdfacf1d586189e5b0 /source/blender/editors/space_file | |
parent | 97e1c0289df4766f926083ca352790108998169b (diff) |
Fix [#21083] Collada exporter defaults to ".blend" extension...
Also added a filter category for COLLADA files to the file selector.
Diffstat (limited to 'source/blender/editors/space_file')
-rw-r--r-- | source/blender/editors/space_file/file_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/filelist.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/filesel.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index 92994b3de53..f3179c05158 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -310,6 +310,8 @@ static int get_file_icon(struct direntry *file) return ICON_FILE_FONT; else if (file->flags & BTXFILE) return ICON_FILE_BLANK; + else if (file->flags & COLLADAFILE) + return ICON_FILE_BLANK; else return ICON_FILE_BLANK; } diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index bc12d45b2d6..0cc58b281b9 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -841,6 +841,8 @@ void filelist_setfiletypes(struct FileList* filelist, short has_quicktime) file->flags |= FTFONTFILE; } else if(BLI_testextensie(file->relname, ".btx")) { file->flags |= BTXFILE; + } else if(BLI_testextensie(file->relname, ".dae")) { + file->flags |= COLLADAFILE; } else if (has_quicktime){ if( BLI_testextensie(file->relname, ".int") || BLI_testextensie(file->relname, ".inta") diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index e025d6d2b9a..5d1a765f457 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -158,6 +158,8 @@ short ED_fileselect_set_params(SpaceFile *sfile) params->filter |= RNA_boolean_get(op->ptr, "filter_folder") ? FOLDERFILE : 0; if(RNA_struct_find_property(op->ptr, "filter_btx")) params->filter |= RNA_boolean_get(op->ptr, "filter_btx") ? BTXFILE : 0; + if(RNA_struct_find_property(op->ptr, "filter_collada")) + params->filter |= RNA_boolean_get(op->ptr, "filter_collada") ? COLLADAFILE : 0; if (params->filter != 0) params->flag |= FILE_FILTER; |