diff options
| author | YimingWu <xp8110@outlook.com> | 2020-02-01 05:35:40 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2020-02-01 05:35:40 +0300 |
| commit | f7770cb97bb9d19d0806f67da9377129fd4d09b0 (patch) | |
| tree | 2cd22d612ffba3a509d5548332c9cc8a06a1a638 /source/blender/editors/io/io_collada.c | |
| parent | b47883a990ee68e659a8a8b44729be9b8e0d002f (diff) | |
| parent | dc3f073d1c5255e79763dfff3ef17f6216f1b391 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lanpr-review
Diffstat (limited to 'source/blender/editors/io/io_collada.c')
| -rw-r--r-- | source/blender/editors/io/io_collada.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index dad84c87fd7..3f51504d6ac 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -541,7 +541,7 @@ void WM_OT_collada_export(wmOperatorType *ot) FILE_TYPE_FOLDER | FILE_TYPE_COLLADA, FILE_BLENDER, FILE_SAVE, - WM_FILESEL_FILEPATH, + WM_FILESEL_FILEPATH | WM_FILESEL_SHOW_PROPS, FILE_DEFAULTDISPLAY, FILE_SORT_ALPHA); @@ -870,7 +870,7 @@ void WM_OT_collada_import(wmOperatorType *ot) FILE_TYPE_FOLDER | FILE_TYPE_COLLADA, FILE_BLENDER, FILE_OPENFILE, - WM_FILESEL_FILEPATH, + WM_FILESEL_FILEPATH | WM_FILESEL_SHOW_PROPS, FILE_DEFAULTDISPLAY, FILE_SORT_ALPHA); |