diff options
Diffstat (limited to 'source/blender/makesdna/DNA_space_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 122 |
1 files changed, 74 insertions, 48 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index bbea3b168e3..1b55a97754a 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -84,9 +84,9 @@ struct BLI_mempool; typedef struct SpaceLink { struct SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; /* XXX make deprecated */ - short blockhandler[8] DNA_DEPRECATED; /* XXX make deprecated */ + char spacetype; + char link_flag; + char _pad0[6]; } SpaceLink; /* -------------------------------------------------------------------- */ @@ -97,9 +97,10 @@ typedef struct SpaceLink { typedef struct SpaceInfo { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; /* XXX make deprecated */ + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ char rpt_mask; char pad[7]; @@ -124,10 +125,10 @@ typedef enum eSpaceInfo_RptMask { typedef struct SpaceButs { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - - short blockhandler[8] DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ @@ -233,9 +234,10 @@ typedef enum eSpaceButtons_SubType { typedef struct SpaceOops { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ @@ -370,9 +372,10 @@ typedef enum eSpaceOutliner_Search_Flags { typedef struct SpaceIpo { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ @@ -446,9 +449,10 @@ typedef enum eGraphEdit_Mode { typedef struct SpaceNla { struct SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ short autosnap; /* this uses the same settings as autosnap for Action Editor */ short flag; @@ -506,10 +510,10 @@ typedef enum eScreen_Redraws_Flag { typedef struct SpaceSeq { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - - short blockhandler[8] DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ @@ -651,8 +655,12 @@ typedef struct FileSelectParams { typedef struct SpaceFile { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + char _pad1[4]; int scroll_offset; struct FileSelectParams *params; /* config and input for file select */ @@ -892,9 +900,10 @@ enum { typedef struct SpaceImage { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - - int flag; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ struct Image *image; struct ImageUser iuser; @@ -921,7 +930,8 @@ typedef struct SpaceImage { /* Filter settings when editor shows other object's UVs. */ int other_uv_filter; - int pad2; + + int flag; MaskSpaceInfo mask_info; } SpaceImage; @@ -1017,9 +1027,10 @@ typedef enum eSpaceImage_OtherUVFilter { typedef struct SpaceText { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ struct Text *text; @@ -1100,8 +1111,11 @@ typedef struct Script { typedef struct SpaceScript { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + struct Script *script; short flags, menunr; @@ -1130,9 +1144,10 @@ typedef struct bNodeTreePath { typedef struct SpaceNode { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; - short blockhandler[8] DNA_DEPRECATED; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ View2D v2d DNA_DEPRECATED; /* deprecated, copied to region */ @@ -1242,9 +1257,10 @@ typedef enum eConsoleLine_Type { typedef struct SpaceConsole { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - float blockscale DNA_DEPRECATED; // XXX are these needed? - short blockhandler[8] DNA_DEPRECATED; // XXX are these needed? + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ /* space vars */ int lheight, pad; @@ -1267,9 +1283,12 @@ typedef struct SpaceConsole { typedef struct SpaceUserPref { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ - char pad[3]; + char _pad1[7]; char filter_type; char filter[64]; /* search term for filtering in the UI */ } SpaceUserPref; @@ -1284,7 +1303,12 @@ typedef struct SpaceUserPref { typedef struct SpaceClip { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + + char _pad1[4]; float xof, yof; /* user defined offset, image is centered */ float xlockof, ylockof; /* user defined offset from locked position */ @@ -1381,9 +1405,10 @@ typedef enum eSpaceClip_GPencil_Source { typedef struct SpaceTopBar { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - - int pad; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ } SpaceTopBar; /** \} */ @@ -1399,9 +1424,10 @@ typedef struct SpaceTopBar { typedef struct SpaceStatusBar { SpaceLink *next, *prev; ListBase regionbase; /* storage of regions for inactive spaces */ - int spacetype; - - int pad; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ } SpaceStatusBar; /** \} */ |