diff options
| author | YimingWu <xp8110@outlook.com> | 2019-09-05 10:06:33 +0300 |
|---|---|---|
| committer | YimingWu <xp8110@outlook.com> | 2019-09-05 10:06:33 +0300 |
| commit | 5396e17fb842fa33d5043255b2397a7b4febf5a6 (patch) | |
| tree | 502eaea846d030e4467aefc604b3bf814f9cc5d8 /source/blender/makesdna | |
| parent | 4f1928c2ae8d35983a3e6f721cedee30ae918c2b (diff) | |
| parent | d813cc706d79daf84100f9090db5f11c917e50c0 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-lanpr-staging
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 498ab290f31..2740d27e1af 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -828,7 +828,7 @@ typedef enum eFileSel_File_Types { FILE_TYPE_FTFONT = (1 << 7), FILE_TYPE_SOUND = (1 << 8), FILE_TYPE_TEXT = (1 << 9), - /* 1 << 10 was FILE_TYPE_MOVIE_ICON, got rid of this so free slot for future type... */ + FILE_TYPE_ARCHIVE = (1 << 10), /** represents folders for filtering */ FILE_TYPE_FOLDER = (1 << 11), FILE_TYPE_BTX = (1 << 12), |