diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-06 13:59:24 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-06 13:59:24 +0400 |
| commit | b8905ba0a6731d2aba6f3487be58b338f35df5f7 (patch) | |
| tree | e3dc4fc0ac799aec6d7f28dcfb16d87c53ec5506 /source/blender/editors/io/io_collada.c | |
| parent | 79f638791d5a0ab6c07cd21c82decdc24329d825 (diff) | |
| parent | 3b743582ec282cfffc84c5e235f58fe2745327c9 (diff) | |
Merge from trunk r49109-r49601
Diffstat (limited to 'source/blender/editors/io/io_collada.c')
| -rw-r--r-- | source/blender/editors/io/io_collada.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index 6e4da6b7e88..ebfc0522f17 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -242,7 +242,8 @@ void WM_OT_collada_export(wmOperatorType *ot) ot->ui = wm_collada_export_draw; - WM_operator_properties_filesel(ot, FOLDERFILE | COLLADAFILE, FILE_BLENDER, FILE_SAVE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); + WM_operator_properties_filesel(ot, FOLDERFILE | COLLADAFILE, FILE_BLENDER, FILE_SAVE, + WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); RNA_def_boolean(ot->srna, "apply_modifiers", 0, "Apply Modifiers", @@ -319,6 +320,7 @@ void WM_OT_collada_import(wmOperatorType *ot) ot->exec = wm_collada_import_exec; ot->poll = WM_operator_winactive; - WM_operator_properties_filesel(ot, FOLDERFILE | COLLADAFILE, FILE_BLENDER, FILE_OPENFILE, WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); + WM_operator_properties_filesel(ot, FOLDERFILE | COLLADAFILE, FILE_BLENDER, FILE_OPENFILE, + WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY); } #endif |