diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-03 19:07:49 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-03 19:07:49 +0400 |
| commit | 66a2b848972d47a033f617a40f9a9044756d1d32 (patch) | |
| tree | bf30f5bc13e9c0b4f52aacead676a2c07cbb331a /source/blender/makesdna/DNA_space_types.h | |
| parent | 0c5dfc8a639b04e1767852121b9dee7cd5bb050f (diff) | |
| parent | 4774357b594c5cd5a38b21df131b539a197c101b (diff) | |
Merged changes in the trunk up to revision 54992.
Resolved conflicts:
release/scripts/startup/bl_ui/space_view3d.py
Diffstat (limited to 'source/blender/makesdna/DNA_space_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 4c1d2c638b9..4587ed948cf 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -28,6 +28,8 @@ * \ingroup DNA * \since mar-2001 * \author nzc + * + * Structs for each of space type in the user interface. */ #ifndef __DNA_SPACE_TYPES_H__ @@ -498,6 +500,7 @@ typedef enum eSpaceSeq_Flag { SEQ_DRAW_SAFE_MARGINS = (1 << 3), SEQ_SHOW_GPENCIL = (1 << 4), SEQ_NO_DRAW_CFRANUM = (1 << 5), + SEQ_USE_ALPHA = (1 << 6), /* use RGBA display mode for preview */ } eSpaceSeq_Flag; /* sseq->view */ @@ -1004,8 +1007,8 @@ typedef struct SpaceUserPref { ListBase regionbase; /* storage of regions for inactive spaces */ int spacetype; - int pad; - + char pad[3]; + char filter_type; char filter[64]; /* search term for filtering in the UI */ } SpaceUserPref; @@ -1133,4 +1136,4 @@ typedef enum eSpace_Type { #define IMG_SIZE_FALLBACK 256 -#endif +#endif /* __DNA_SPACE_TYPES_H__ */ |