diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-18 13:32:12 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-18 13:32:12 +0300 |
| commit | 324e10e76af43788c282e5a08eb18fde48bb488b (patch) | |
| tree | b2c3ad71aefba138cd8030c0b066dab4a747207c /source/blender/makesdna/DNA_space_types.h | |
| parent | 5e47f365e1e743ca1cc86e9f1dad936d5ce7e93a (diff) | |
| parent | 579631819f0136ab0fbb0f6c7c21265b468940dc (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/makesrna/intern/rna_space.c
Diffstat (limited to 'source/blender/makesdna/DNA_space_types.h')
| -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 18fd17c006e..4f07a30ed70 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -620,7 +620,7 @@ typedef struct FileSelectParams { char renamefile[256]; char renameedit[256]; /* annoying but the first is only used for initialization */ - char filter_glob[256]; /* list of filetypes to filter */ + char filter_glob[256]; /* FILE_MAXFILE */ /* list of filetypes to filter */ char filter_search[64]; /* text items' name must match to be shown. */ int filter_id; /* same as filter, but for ID types (aka library groups). */ |