diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/makesdna/DNA_space_types.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/makesdna/DNA_space_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_space_types.h | 2164 |
1 files changed, 1076 insertions, 1088 deletions
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 919afef4b32..8323a64bce1 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -27,13 +27,13 @@ #include "DNA_defs.h" #include "DNA_listBase.h" -#include "DNA_color_types.h" /* for Histogram */ +#include "DNA_color_types.h" /* for Histogram */ #include "DNA_vec_types.h" -#include "DNA_outliner_types.h" /* for TreeStoreElem */ -#include "DNA_image_types.h" /* ImageUser */ -#include "DNA_movieclip_types.h" /* MovieClipUser */ -#include "DNA_sequence_types.h" /* SequencerScopes */ -#include "DNA_node_types.h" /* for bNodeInstanceKey */ +#include "DNA_outliner_types.h" /* for TreeStoreElem */ +#include "DNA_image_types.h" /* ImageUser */ +#include "DNA_movieclip_types.h" /* MovieClipUser */ +#include "DNA_sequence_types.h" /* SequencerScopes */ +#include "DNA_node_types.h" /* for bNodeInstanceKey */ /* Hum ... Not really nice... but needed for spacebuts. */ #include "DNA_view2d_types.h" @@ -61,7 +61,6 @@ struct wmTimer; * define to enable writing (should become the default in a bit). */ //#define WITH_GLOBAL_AREA_WRITING - /* -------------------------------------------------------------------- */ /** \name SpaceLink (Base) * \{ */ @@ -72,12 +71,12 @@ struct wmTimer; * good to make this explicit. */ typedef struct SpaceLink { - struct SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; + struct SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; } SpaceLink; /** \} */ @@ -88,25 +87,25 @@ typedef struct SpaceLink { /* Info Header */ typedef struct SpaceInfo { - SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; - /* End 'SpaceLink' header. */ - - char rpt_mask; - char _pad[7]; + SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + + char rpt_mask; + char _pad[7]; } SpaceInfo; /* SpaceInfo.rpt_mask */ typedef enum eSpaceInfo_RptMask { - INFO_RPT_DEBUG = (1 << 0), - INFO_RPT_INFO = (1 << 1), - INFO_RPT_OP = (1 << 2), - INFO_RPT_WARN = (1 << 3), - INFO_RPT_ERR = (1 << 4), + INFO_RPT_DEBUG = (1 << 0), + INFO_RPT_INFO = (1 << 1), + INFO_RPT_OP = (1 << 2), + INFO_RPT_WARN = (1 << 3), + INFO_RPT_ERR = (1 << 4), } eSpaceInfo_RptMask; /** \} */ @@ -117,99 +116,99 @@ typedef enum eSpaceInfo_RptMask { /* Properties Editor */ typedef struct SpaceProperties { - SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; - /* End 'SpaceLink' header. */ - - /** Deprecated, copied to region. */ - View2D v2d DNA_DEPRECATED; - - /* For different kinds of property editors (exposed in the space type selector). */ - short space_subtype; - - /** Context tabs. */ - short mainb, mainbo, mainbuser; - /** Preview is signal to refresh. */ - short preview; - char _pad[5]; - char flag; - - /** Runtime. */ - void *path; - /** Runtime. */ - int pathflag, dataicon; - ID *pinid; - - void *texuser; + SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + + /** Deprecated, copied to region. */ + View2D v2d DNA_DEPRECATED; + + /* For different kinds of property editors (exposed in the space type selector). */ + short space_subtype; + + /** Context tabs. */ + short mainb, mainbo, mainbuser; + /** Preview is signal to refresh. */ + short preview; + char _pad[5]; + char flag; + + /** Runtime. */ + void *path; + /** Runtime. */ + int pathflag, dataicon; + ID *pinid; + + void *texuser; } SpaceProperties; /* button defines (deprecated) */ #ifdef DNA_DEPRECATED_ALLOW /* warning: the values of these defines are used in SpaceProperties.tabs[8] */ /* SpaceProperties.mainb new */ -#define CONTEXT_SCENE 0 -#define CONTEXT_OBJECT 1 +# define CONTEXT_SCENE 0 +# define CONTEXT_OBJECT 1 // #define CONTEXT_TYPES 2 -#define CONTEXT_SHADING 3 -#define CONTEXT_EDITING 4 +# define CONTEXT_SHADING 3 +# define CONTEXT_EDITING 4 // #define CONTEXT_SCRIPT 5 // #define CONTEXT_LOGIC 6 /* SpaceProperties.mainb old (deprecated) */ // #define BUTS_VIEW 0 -#define BUTS_LAMP 1 -#define BUTS_MAT 2 -#define BUTS_TEX 3 -#define BUTS_ANIM 4 -#define BUTS_WORLD 5 -#define BUTS_RENDER 6 -#define BUTS_EDIT 7 +# define BUTS_LAMP 1 +# define BUTS_MAT 2 +# define BUTS_TEX 3 +# define BUTS_ANIM 4 +# define BUTS_WORLD 5 +# define BUTS_RENDER 6 +# define BUTS_EDIT 7 // #define BUTS_GAME 8 -#define BUTS_FPAINT 9 -#define BUTS_RADIO 10 -#define BUTS_SCRIPT 11 +# define BUTS_FPAINT 9 +# define BUTS_RADIO 10 +# define BUTS_SCRIPT 11 // #define BUTS_SOUND 12 -#define BUTS_CONSTRAINT 13 +# define BUTS_CONSTRAINT 13 // #define BUTS_EFFECTS 14 #endif /* DNA_DEPRECATED_ALLOW */ /* SpaceProperties.mainb new */ typedef enum eSpaceButtons_Context { - BCONTEXT_RENDER = 0, - BCONTEXT_SCENE = 1, - BCONTEXT_WORLD = 2, - BCONTEXT_OBJECT = 3, - BCONTEXT_DATA = 4, - BCONTEXT_MATERIAL = 5, - BCONTEXT_TEXTURE = 6, - BCONTEXT_PARTICLE = 7, - BCONTEXT_PHYSICS = 8, - BCONTEXT_BONE = 9, - BCONTEXT_MODIFIER = 10, - BCONTEXT_CONSTRAINT = 11, - BCONTEXT_BONE_CONSTRAINT = 12, - BCONTEXT_VIEW_LAYER = 13, - BCONTEXT_TOOL = 14, - BCONTEXT_SHADERFX = 15, - BCONTEXT_OUTPUT = 16, - - /* always as last... */ - BCONTEXT_TOT, + BCONTEXT_RENDER = 0, + BCONTEXT_SCENE = 1, + BCONTEXT_WORLD = 2, + BCONTEXT_OBJECT = 3, + BCONTEXT_DATA = 4, + BCONTEXT_MATERIAL = 5, + BCONTEXT_TEXTURE = 6, + BCONTEXT_PARTICLE = 7, + BCONTEXT_PHYSICS = 8, + BCONTEXT_BONE = 9, + BCONTEXT_MODIFIER = 10, + BCONTEXT_CONSTRAINT = 11, + BCONTEXT_BONE_CONSTRAINT = 12, + BCONTEXT_VIEW_LAYER = 13, + BCONTEXT_TOOL = 14, + BCONTEXT_SHADERFX = 15, + BCONTEXT_OUTPUT = 16, + + /* always as last... */ + BCONTEXT_TOT, } eSpaceButtons_Context; /* SpaceProperties.flag */ typedef enum eSpaceButtons_Flag { - SB_PRV_OSA = (1 << 0), - SB_PIN_CONTEXT = (1 << 1), - SB_FLAG_UNUSED_2 = (1 << 2), - SB_FLAG_UNUSED_3 = (1 << 3), - /** Do not add materials, particles, etc. in TemplateTextureUser list. */ - SB_TEX_USER_LIMITED = (1 << 3), - SB_SHADING_CONTEXT = (1 << 4), + SB_PRV_OSA = (1 << 0), + SB_PIN_CONTEXT = (1 << 1), + SB_FLAG_UNUSED_2 = (1 << 2), + SB_FLAG_UNUSED_3 = (1 << 3), + /** Do not add materials, particles, etc. in TemplateTextureUser list. */ + SB_TEX_USER_LIMITED = (1 << 3), + SB_SHADING_CONTEXT = (1 << 4), } eSpaceButtons_Flag; /** \} */ @@ -220,138 +219,131 @@ typedef enum eSpaceButtons_Flag { /* Outliner */ typedef struct SpaceOutliner { - SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; - /* End 'SpaceLink' header. */ - - /** Deprecated, copied to region. */ - View2D v2d DNA_DEPRECATED; - - ListBase tree; - - /* treestore is an ordered list of TreeStoreElem's from outliner tree; - * Note that treestore may contain duplicate elements if element - * is used multiple times in outliner tree (e. g. linked objects) - * Also note that BLI_mempool can not be read/written in DNA directly, - * therefore readfile.c/writefile.c linearize treestore into TreeStore structure - */ - struct BLI_mempool *treestore; - - /* search stuff */ - char search_string[64]; - struct TreeStoreElem search_tse; - - short flag, outlinevis, storeflag, search_flags; - int filter; - char filter_state; - char _pad; - short filter_id_type; - - /** - * Pointers to treestore elements, grouped by (id, type, nr) - * in hashtable for faster searching */ - void *treehash; + SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + + /** Deprecated, copied to region. */ + View2D v2d DNA_DEPRECATED; + + ListBase tree; + + /* treestore is an ordered list of TreeStoreElem's from outliner tree; + * Note that treestore may contain duplicate elements if element + * is used multiple times in outliner tree (e. g. linked objects) + * Also note that BLI_mempool can not be read/written in DNA directly, + * therefore readfile.c/writefile.c linearize treestore into TreeStore structure + */ + struct BLI_mempool *treestore; + + /* search stuff */ + char search_string[64]; + struct TreeStoreElem search_tse; + + short flag, outlinevis, storeflag, search_flags; + int filter; + char filter_state; + char _pad; + short filter_id_type; + + /** + * Pointers to treestore elements, grouped by (id, type, nr) + * in hashtable for faster searching */ + void *treehash; } SpaceOutliner; - /* SpaceOutliner.flag */ typedef enum eSpaceOutliner_Flag { - SO_TESTBLOCKS = (1 << 0), - SO_NEWSELECTED = (1 << 1), - SO_HIDE_RESTRICTCOLS = (1 << 2), - SO_HIDE_KEYINGSETINFO = (1 << 3), - SO_SKIP_SORT_ALPHA = (1 << 4), + SO_TESTBLOCKS = (1 << 0), + SO_NEWSELECTED = (1 << 1), + SO_HIDE_RESTRICTCOLS = (1 << 2), + SO_HIDE_KEYINGSETINFO = (1 << 3), + SO_SKIP_SORT_ALPHA = (1 << 4), } eSpaceOutliner_Flag; /* SpaceOutliner.filter */ typedef enum eSpaceOutliner_Filter { - SO_FILTER_SEARCH = (1 << 0), /* Run-time flag. */ - SO_FILTER_UNUSED_1 = (1 << 1), /* cleared */ - SO_FILTER_NO_OBJECT = (1 << 2), - SO_FILTER_NO_OB_CONTENT = (1 << 3), /* Not only mesh, but modifiers, constraints, ... */ - SO_FILTER_NO_CHILDREN = (1 << 4), - - SO_FILTER_UNUSED_5 = (1 << 5), /* cleared */ - SO_FILTER_NO_OB_MESH = (1 << 6), - SO_FILTER_NO_OB_ARMATURE = (1 << 7), - SO_FILTER_NO_OB_EMPTY = (1 << 8), - SO_FILTER_NO_OB_LAMP = (1 << 9), - SO_FILTER_NO_OB_CAMERA = (1 << 10), - SO_FILTER_NO_OB_OTHERS = (1 << 11), - - SO_FILTER_UNUSED_12 = (1 << 12), /* cleared */ - SO_FILTER_OB_STATE_VISIBLE = (1 << 13), /* Not set via DNA. */ - SO_FILTER_OB_STATE_SELECTED = (1 << 14), /* Not set via DNA. */ - SO_FILTER_OB_STATE_ACTIVE = (1 << 15), /* Not set via DNA. */ - SO_FILTER_NO_COLLECTION = (1 << 16), - - SO_FILTER_ID_TYPE = (1 << 17), + SO_FILTER_SEARCH = (1 << 0), /* Run-time flag. */ + SO_FILTER_UNUSED_1 = (1 << 1), /* cleared */ + SO_FILTER_NO_OBJECT = (1 << 2), + SO_FILTER_NO_OB_CONTENT = (1 << 3), /* Not only mesh, but modifiers, constraints, ... */ + SO_FILTER_NO_CHILDREN = (1 << 4), + + SO_FILTER_UNUSED_5 = (1 << 5), /* cleared */ + SO_FILTER_NO_OB_MESH = (1 << 6), + SO_FILTER_NO_OB_ARMATURE = (1 << 7), + SO_FILTER_NO_OB_EMPTY = (1 << 8), + SO_FILTER_NO_OB_LAMP = (1 << 9), + SO_FILTER_NO_OB_CAMERA = (1 << 10), + SO_FILTER_NO_OB_OTHERS = (1 << 11), + + SO_FILTER_UNUSED_12 = (1 << 12), /* cleared */ + SO_FILTER_OB_STATE_VISIBLE = (1 << 13), /* Not set via DNA. */ + SO_FILTER_OB_STATE_SELECTED = (1 << 14), /* Not set via DNA. */ + SO_FILTER_OB_STATE_ACTIVE = (1 << 15), /* Not set via DNA. */ + SO_FILTER_NO_COLLECTION = (1 << 16), + + SO_FILTER_ID_TYPE = (1 << 17), } eSpaceOutliner_Filter; -#define SO_FILTER_OB_TYPE (SO_FILTER_NO_OB_MESH | \ - SO_FILTER_NO_OB_ARMATURE | \ - SO_FILTER_NO_OB_EMPTY | \ - SO_FILTER_NO_OB_LAMP | \ - SO_FILTER_NO_OB_CAMERA | \ - SO_FILTER_NO_OB_OTHERS) +#define SO_FILTER_OB_TYPE \ + (SO_FILTER_NO_OB_MESH | SO_FILTER_NO_OB_ARMATURE | SO_FILTER_NO_OB_EMPTY | \ + SO_FILTER_NO_OB_LAMP | SO_FILTER_NO_OB_CAMERA | SO_FILTER_NO_OB_OTHERS) -#define SO_FILTER_OB_STATE (SO_FILTER_OB_STATE_VISIBLE | \ - SO_FILTER_OB_STATE_SELECTED | \ - SO_FILTER_OB_STATE_ACTIVE) +#define SO_FILTER_OB_STATE \ + (SO_FILTER_OB_STATE_VISIBLE | SO_FILTER_OB_STATE_SELECTED | SO_FILTER_OB_STATE_ACTIVE) -#define SO_FILTER_ANY (SO_FILTER_NO_OB_CONTENT | \ - SO_FILTER_NO_CHILDREN | \ - SO_FILTER_OB_TYPE | \ - SO_FILTER_OB_STATE | \ - SO_FILTER_NO_COLLECTION) +#define SO_FILTER_ANY \ + (SO_FILTER_NO_OB_CONTENT | SO_FILTER_NO_CHILDREN | SO_FILTER_OB_TYPE | SO_FILTER_OB_STATE | \ + SO_FILTER_NO_COLLECTION) /* SpaceOutliner.filter_state */ typedef enum eSpaceOutliner_StateFilter { - SO_FILTER_OB_ALL = 0, - SO_FILTER_OB_VISIBLE = 1, - SO_FILTER_OB_SELECTED = 2, - SO_FILTER_OB_ACTIVE = 3, + SO_FILTER_OB_ALL = 0, + SO_FILTER_OB_VISIBLE = 1, + SO_FILTER_OB_SELECTED = 2, + SO_FILTER_OB_ACTIVE = 3, } eSpaceOutliner_StateFilter; /* SpaceOutliner.outlinevis */ typedef enum eSpaceOutliner_Mode { - SO_SCENES = 0, - /* SO_CUR_SCENE = 1, */ /* deprecated! */ - /* SO_VISIBLE = 2, */ /* deprecated! */ - /* SO_SELECTED = 3, */ /* deprecated! */ - /* SO_ACTIVE = 4, */ /* deprecated! */ - /* SO_SAME_TYPE = 5, */ /* deprecated! */ - /* SO_GROUPS = 6, */ /* deprecated! */ - SO_LIBRARIES = 7, - /* SO_VERSE_SESSION = 8, */ /* deprecated! */ - /* SO_VERSE_MS = 9, */ /* deprecated! */ - SO_SEQUENCE = 10, - SO_DATA_API = 11, - /* SO_USERDEF = 12, */ /* deprecated! */ - /* SO_KEYMAP = 13, */ /* deprecated! */ - SO_ID_ORPHANS = 14, - SO_VIEW_LAYER = 15, + SO_SCENES = 0, + /* SO_CUR_SCENE = 1, */ /* deprecated! */ + /* SO_VISIBLE = 2, */ /* deprecated! */ + /* SO_SELECTED = 3, */ /* deprecated! */ + /* SO_ACTIVE = 4, */ /* deprecated! */ + /* SO_SAME_TYPE = 5, */ /* deprecated! */ + /* SO_GROUPS = 6, */ /* deprecated! */ + SO_LIBRARIES = 7, + /* SO_VERSE_SESSION = 8, */ /* deprecated! */ + /* SO_VERSE_MS = 9, */ /* deprecated! */ + SO_SEQUENCE = 10, + SO_DATA_API = 11, + /* SO_USERDEF = 12, */ /* deprecated! */ + /* SO_KEYMAP = 13, */ /* deprecated! */ + SO_ID_ORPHANS = 14, + SO_VIEW_LAYER = 15, } eSpaceOutliner_Mode; /* SpaceOutliner.storeflag */ typedef enum eSpaceOutliner_StoreFlag { - /* cleanup tree */ - SO_TREESTORE_CLEANUP = (1 << 0), - SO_TREESTORE_UNUSED_1 = (1 << 1), /* cleared */ - /* rebuild the tree, similar to cleanup, - * but defer a call to BKE_outliner_treehash_rebuild_from_treestore instead */ - SO_TREESTORE_REBUILD = (1 << 2), + /* cleanup tree */ + SO_TREESTORE_CLEANUP = (1 << 0), + SO_TREESTORE_UNUSED_1 = (1 << 1), /* cleared */ + /* rebuild the tree, similar to cleanup, + * but defer a call to BKE_outliner_treehash_rebuild_from_treestore instead */ + SO_TREESTORE_REBUILD = (1 << 2), } eSpaceOutliner_StoreFlag; /* outliner search flags (SpaceOutliner.search_flags) */ typedef enum eSpaceOutliner_Search_Flags { - SO_FIND_CASE_SENSITIVE = (1 << 0), - SO_FIND_COMPLETE = (1 << 1), - SO_SEARCH_RECURSIVE = (1 << 2), + SO_FIND_CASE_SENSITIVE = (1 << 0), + SO_FIND_COMPLETE = (1 << 1), + SO_SEARCH_RECURSIVE = (1 << 2), } eSpaceOutliner_Search_Flags; /** \} */ @@ -361,102 +353,101 @@ typedef enum eSpaceOutliner_Search_Flags { * \{ */ typedef struct SpaceGraph_Runtime { - /** #eGraphEdit_Runtime_Flag */ - char flag; - char _pad[7]; - /** Sampled snapshots of F-Curves used as in-session guides */ - ListBase ghost_curves; + /** #eGraphEdit_Runtime_Flag */ + char flag; + char _pad[7]; + /** Sampled snapshots of F-Curves used as in-session guides */ + ListBase ghost_curves; } SpaceGraph_Runtime; /* 'Graph' Editor (formerly known as the IPO Editor) */ typedef struct SpaceGraph { - SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; - /* End 'SpaceLink' header. */ - - /** Deprecated, copied to region. */ - View2D v2d DNA_DEPRECATED; - - /** Settings for filtering animation data - * \note we use a pointer due to code-linking issues. */ - struct bDopeSheet *ads; - - /** Mode for the Graph editor (eGraphEdit_Mode). */ - short mode; - /** - * Time-transform autosnapping settings for Graph editor - * (eAnimEdit_AutoSnap in DNA_action_types.h). - */ - short autosnap; - /** Settings for Graph editor (eGraphEdit_Flag). */ - int flag; - - /** Time value for cursor (when in drivers mode; animation uses current frame). */ - float cursorTime; - /** Cursor value (y-value, x-value is current frame). */ - float cursorVal; - /** Pivot point for transforms. */ - int around; - char _pad[4]; - - SpaceGraph_Runtime runtime; + SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + + /** Deprecated, copied to region. */ + View2D v2d DNA_DEPRECATED; + + /** Settings for filtering animation data + * \note we use a pointer due to code-linking issues. */ + struct bDopeSheet *ads; + + /** Mode for the Graph editor (eGraphEdit_Mode). */ + short mode; + /** + * Time-transform autosnapping settings for Graph editor + * (eAnimEdit_AutoSnap in DNA_action_types.h). + */ + short autosnap; + /** Settings for Graph editor (eGraphEdit_Flag). */ + int flag; + + /** Time value for cursor (when in drivers mode; animation uses current frame). */ + float cursorTime; + /** Cursor value (y-value, x-value is current frame). */ + float cursorVal; + /** Pivot point for transforms. */ + int around; + char _pad[4]; + + SpaceGraph_Runtime runtime; } SpaceGraph; - /* SpaceGraph.flag (Graph Editor Settings) */ typedef enum eGraphEdit_Flag { - /* OLD DEPRECEATED SETTING */ - /* SIPO_LOCK_VIEW = (1 << 0), */ - - /* don't merge keyframes on the same frame after a transform */ - SIPO_NOTRANSKEYCULL = (1 << 1), - /* don't show any keyframe handles at all */ - SIPO_NOHANDLES = (1 << 2), - /* don't show current frame number beside indicator line */ - SIPO_NODRAWCFRANUM = (1 << 3), - /* show timing in seconds instead of frames */ - SIPO_DRAWTIME = (1 << 4), - /* only show keyframes for selected F-Curves */ - SIPO_SELCUVERTSONLY = (1 << 5), - /* draw names of F-Curves beside the respective curves */ - /* NOTE: currently not used */ - SIPO_DRAWNAMES = (1 << 6), - /* show sliders in channels list */ - SIPO_SLIDERS = (1 << 7), - /* don't show the horizontal component of the cursor */ - SIPO_NODRAWCURSOR = (1 << 8), - /* only show handles of selected keyframes */ - SIPO_SELVHANDLESONLY = (1 << 9), - /* don't perform realtime updates */ - SIPO_NOREALTIMEUPDATES = (1 << 11), - /* don't draw curves with AA ("beauty-draw") for performance */ - SIPO_BEAUTYDRAW_OFF = (1 << 12), - /* draw grouped channels with colors set in group */ - SIPO_NODRAWGCOLORS = (1 << 13), - /* normalize curves on display */ - SIPO_NORMALIZE = (1 << 14), - SIPO_NORMALIZE_FREEZE = (1 << 15), - /* show vertical line for every marker */ - SIPO_MARKER_LINES = (1 << 16), + /* OLD DEPRECEATED SETTING */ + /* SIPO_LOCK_VIEW = (1 << 0), */ + + /* don't merge keyframes on the same frame after a transform */ + SIPO_NOTRANSKEYCULL = (1 << 1), + /* don't show any keyframe handles at all */ + SIPO_NOHANDLES = (1 << 2), + /* don't show current frame number beside indicator line */ + SIPO_NODRAWCFRANUM = (1 << 3), + /* show timing in seconds instead of frames */ + SIPO_DRAWTIME = (1 << 4), + /* only show keyframes for selected F-Curves */ + SIPO_SELCUVERTSONLY = (1 << 5), + /* draw names of F-Curves beside the respective curves */ + /* NOTE: currently not used */ + SIPO_DRAWNAMES = (1 << 6), + /* show sliders in channels list */ + SIPO_SLIDERS = (1 << 7), + /* don't show the horizontal component of the cursor */ + SIPO_NODRAWCURSOR = (1 << 8), + /* only show handles of selected keyframes */ + SIPO_SELVHANDLESONLY = (1 << 9), + /* don't perform realtime updates */ + SIPO_NOREALTIMEUPDATES = (1 << 11), + /* don't draw curves with AA ("beauty-draw") for performance */ + SIPO_BEAUTYDRAW_OFF = (1 << 12), + /* draw grouped channels with colors set in group */ + SIPO_NODRAWGCOLORS = (1 << 13), + /* normalize curves on display */ + SIPO_NORMALIZE = (1 << 14), + SIPO_NORMALIZE_FREEZE = (1 << 15), + /* show vertical line for every marker */ + SIPO_MARKER_LINES = (1 << 16), } eGraphEdit_Flag; /* SpaceGraph.mode (Graph Editor Mode) */ typedef enum eGraphEdit_Mode { - /* all animation curves (from all over Blender) */ - SIPO_MODE_ANIMATION = 0, - /* drivers only */ - SIPO_MODE_DRIVERS = 1, + /* all animation curves (from all over Blender) */ + SIPO_MODE_ANIMATION = 0, + /* drivers only */ + SIPO_MODE_DRIVERS = 1, } eGraphEdit_Mode; typedef enum eGraphEdit_Runtime_Flag { - /** Temporary flag to force channel selections to be synced with main. */ - SIPO_RUNTIME_FLAG_NEED_CHAN_SYNC = (1 << 0), - /** Temporary flag to force fcurves to recalculate colors. */ - SIPO_RUNTIME_FLAG_NEED_CHAN_SYNC_COLOR = (1 << 1), + /** Temporary flag to force channel selections to be synced with main. */ + SIPO_RUNTIME_FLAG_NEED_CHAN_SYNC = (1 << 0), + /** Temporary flag to force fcurves to recalculate colors. */ + SIPO_RUNTIME_FLAG_NEED_CHAN_SYNC_COLOR = (1 << 1), } eGraphEdit_Runtime_Flag; /** \} */ @@ -467,41 +458,41 @@ typedef enum eGraphEdit_Runtime_Flag { /* NLA Editor */ typedef struct SpaceNla { - struct SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; - /* End 'SpaceLink' header. */ - - /** This uses the same settings as autosnap for Action Editor. */ - short autosnap; - short flag; - char _pad[4]; - - struct bDopeSheet *ads; - /** Deprecated, copied to region. */ - View2D v2d DNA_DEPRECATED; + struct SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + + /** This uses the same settings as autosnap for Action Editor. */ + short autosnap; + short flag; + char _pad[4]; + + struct bDopeSheet *ads; + /** Deprecated, copied to region. */ + View2D v2d DNA_DEPRECATED; } SpaceNla; /* SpaceNla.flag */ typedef enum eSpaceNla_Flag { - SNLA_FLAG_UNUSED_0 = (1 << 0), - SNLA_FLAG_UNUSED_1 = (1 << 1), - /* draw timing in seconds instead of frames */ - SNLA_DRAWTIME = (1 << 2), - SNLA_FLAG_UNUSED_3 = (1 << 3), - /* don't draw frame number beside frame indicator */ - SNLA_NODRAWCFRANUM = (1 << 4), - /* don't draw influence curves on strips */ - SNLA_NOSTRIPCURVES = (1 << 5), - /* don't perform realtime updates */ - SNLA_NOREALTIMEUPDATES = (1 << 6), - /* don't show local strip marker indications */ - SNLA_NOLOCALMARKERS = (1 << 7), - /* show vertical line for every marker */ - SNLA_SHOW_MARKER_LINES = (1 << 8), + SNLA_FLAG_UNUSED_0 = (1 << 0), + SNLA_FLAG_UNUSED_1 = (1 << 1), + /* draw timing in seconds instead of frames */ + SNLA_DRAWTIME = (1 << 2), + SNLA_FLAG_UNUSED_3 = (1 << 3), + /* don't draw frame number beside frame indicator */ + SNLA_NODRAWCFRANUM = (1 << 4), + /* don't draw influence curves on strips */ + SNLA_NOSTRIPCURVES = (1 << 5), + /* don't perform realtime updates */ + SNLA_NOREALTIMEUPDATES = (1 << 6), + /* don't show local strip marker indications */ + SNLA_NOLOCALMARKERS = (1 << 7), + /* show vertical line for every marker */ + SNLA_SHOW_MARKER_LINES = (1 << 8), } eSpaceNla_Flag; /** \} */ @@ -512,115 +503,113 @@ typedef enum eSpaceNla_Flag { /* Sequencer */ typedef struct SpaceSeq { - SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; - /* End 'SpaceLink' header. */ - - /** Deprecated, copied to region. */ - View2D v2d DNA_DEPRECATED; - - /** Deprecated: offset for drawing the image preview. */ - float xof DNA_DEPRECATED, yof DNA_DEPRECATED; - /** Weird name for the sequencer subtype (seq, image, luma... etc). */ - short mainb; - /** ESpaceSeq_Proxy_RenderSize. */ - short render_size; - short chanshown; - short zebra; - int flag; - /** Deprecated, handled by View2D now. */ - float zoom DNA_DEPRECATED; - /** See SEQ_VIEW_* below. */ - int view; - int overlay_type; - /** Overlay an image of the editing on below the strips. */ - int draw_flag; - char _pad[4]; - - /** Grease-pencil data. */ - struct bGPdata *gpd; - - /** Different scoped displayed in space. */ - struct SequencerScopes scopes; - - /** Multiview current eye - for internal use. */ - char multiview_eye; - char _pad2[7]; - - struct GPUFX *compositor; - void *_pad3; + SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + + /** Deprecated, copied to region. */ + View2D v2d DNA_DEPRECATED; + + /** Deprecated: offset for drawing the image preview. */ + float xof DNA_DEPRECATED, yof DNA_DEPRECATED; + /** Weird name for the sequencer subtype (seq, image, luma... etc). */ + short mainb; + /** ESpaceSeq_Proxy_RenderSize. */ + short render_size; + short chanshown; + short zebra; + int flag; + /** Deprecated, handled by View2D now. */ + float zoom DNA_DEPRECATED; + /** See SEQ_VIEW_* below. */ + int view; + int overlay_type; + /** Overlay an image of the editing on below the strips. */ + int draw_flag; + char _pad[4]; + + /** Grease-pencil data. */ + struct bGPdata *gpd; + + /** Different scoped displayed in space. */ + struct SequencerScopes scopes; + + /** Multiview current eye - for internal use. */ + char multiview_eye; + char _pad2[7]; + + struct GPUFX *compositor; + void *_pad3; } SpaceSeq; - /* SpaceSeq.mainb */ typedef enum eSpaceSeq_RegionType { - SEQ_DRAW_SEQUENCE = 0, - SEQ_DRAW_IMG_IMBUF = 1, - SEQ_DRAW_IMG_WAVEFORM = 2, - SEQ_DRAW_IMG_VECTORSCOPE = 3, - SEQ_DRAW_IMG_HISTOGRAM = 4, + SEQ_DRAW_SEQUENCE = 0, + SEQ_DRAW_IMG_IMBUF = 1, + SEQ_DRAW_IMG_WAVEFORM = 2, + SEQ_DRAW_IMG_VECTORSCOPE = 3, + SEQ_DRAW_IMG_HISTOGRAM = 4, } eSpaceSeq_RegionType; /* SpaceSeq.draw_flag */ typedef enum eSpaceSeq_DrawFlag { - SEQ_DRAW_BACKDROP = (1 << 0), - SEQ_DRAW_OFFSET_EXT = (1 << 1), + SEQ_DRAW_BACKDROP = (1 << 0), + SEQ_DRAW_OFFSET_EXT = (1 << 1), } eSpaceSeq_DrawFlag; - /* SpaceSeq.flag */ typedef enum eSpaceSeq_Flag { - SEQ_DRAWFRAMES = (1 << 0), - SEQ_MARKER_TRANS = (1 << 1), - SEQ_DRAW_COLOR_SEPARATED = (1 << 2), - SEQ_SHOW_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 */ - SEQ_ALL_WAVEFORMS = (1 << 7), /* draw all waveforms */ - SEQ_NO_WAVEFORMS = (1 << 8), /* draw no waveforms */ - SEQ_SHOW_SAFE_CENTER = (1 << 9), - SEQ_SHOW_METADATA = (1 << 10), - SEQ_SHOW_MARKER_LINES = (1 << 11), + SEQ_DRAWFRAMES = (1 << 0), + SEQ_MARKER_TRANS = (1 << 1), + SEQ_DRAW_COLOR_SEPARATED = (1 << 2), + SEQ_SHOW_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 */ + SEQ_ALL_WAVEFORMS = (1 << 7), /* draw all waveforms */ + SEQ_NO_WAVEFORMS = (1 << 8), /* draw no waveforms */ + SEQ_SHOW_SAFE_CENTER = (1 << 9), + SEQ_SHOW_METADATA = (1 << 10), + SEQ_SHOW_MARKER_LINES = (1 << 11), } eSpaceSeq_Flag; /* SpaceSeq.view */ typedef enum eSpaceSeq_Displays { - SEQ_VIEW_SEQUENCE = 1, - SEQ_VIEW_PREVIEW = 2, - SEQ_VIEW_SEQUENCE_PREVIEW = 3, + SEQ_VIEW_SEQUENCE = 1, + SEQ_VIEW_PREVIEW = 2, + SEQ_VIEW_SEQUENCE_PREVIEW = 3, } eSpaceSeq_Dispays; /* SpaceSeq.render_size */ typedef enum eSpaceSeq_Proxy_RenderSize { - SEQ_PROXY_RENDER_SIZE_NONE = -1, - SEQ_PROXY_RENDER_SIZE_SCENE = 0, - SEQ_PROXY_RENDER_SIZE_25 = 25, - SEQ_PROXY_RENDER_SIZE_50 = 50, - SEQ_PROXY_RENDER_SIZE_75 = 75, - SEQ_PROXY_RENDER_SIZE_100 = 99, - SEQ_PROXY_RENDER_SIZE_FULL = 100, + SEQ_PROXY_RENDER_SIZE_NONE = -1, + SEQ_PROXY_RENDER_SIZE_SCENE = 0, + SEQ_PROXY_RENDER_SIZE_25 = 25, + SEQ_PROXY_RENDER_SIZE_50 = 50, + SEQ_PROXY_RENDER_SIZE_75 = 75, + SEQ_PROXY_RENDER_SIZE_100 = 99, + SEQ_PROXY_RENDER_SIZE_FULL = 100, } eSpaceSeq_Proxy_RenderSize; typedef struct MaskSpaceInfo { - /* **** mask editing **** */ - struct Mask *mask; - /* draw options */ - char draw_flag; - char draw_type; - char overlay_mode; - char _pad3[5]; + /* **** mask editing **** */ + struct Mask *mask; + /* draw options */ + char draw_flag; + char draw_type; + char overlay_mode; + char _pad3[5]; } MaskSpaceInfo; /* SpaceSeq.mainb */ typedef enum eSpaceSeq_OverlayType { - SEQ_DRAW_OVERLAY_RECT = 0, - SEQ_DRAW_OVERLAY_REFERENCE = 1, - SEQ_DRAW_OVERLAY_CURRENT = 2, + SEQ_DRAW_OVERLAY_RECT = 0, + SEQ_DRAW_OVERLAY_REFERENCE = 1, + SEQ_DRAW_OVERLAY_CURRENT = 2, } eSpaceSeq_OverlayType; /** \} */ @@ -631,167 +620,167 @@ typedef enum eSpaceSeq_OverlayType { /* Config and Input for File Selector */ typedef struct FileSelectParams { - /** Title, also used for the text of the execute button. */ - char title[96]; - /** - * Directory, FILE_MAX_LIBEXTRA, 1024 + 66, this is for extreme case when 1023 length path - * needs to be linked in, where foo.blend/Armature need adding - */ - char dir[1090]; - char file[256]; - - char renamefile[256]; - short rename_flag; - - /** List of filetypes to filter (FILE_MAXFILE). */ - char filter_glob[256]; - - /** Text items name must match to be shown. */ - char filter_search[64]; - /** Same as filter, but for ID types (aka library groups). */ - int filter_id; - - /** Active file used for keyboard navigation. */ - int active_file; - /** File under cursor. */ - int highlight_file; - int sel_first; - int sel_last; - unsigned short thumbnail_size; - char _pad1[2]; - - /* short */ - /** XXXXX for now store type here, should be moved to the operator. */ - short type; - /** Settings for filter, hiding dots files. */ - short flag; - /** Sort order. */ - short sort; - /** Display mode flag. */ - short display; - short display_previous; - /** Filter when (flags & FILE_FILTER) is true. */ - char _pad2[2]; - int filter; - - /** Max number of levels in dirtree to show at once, 0 to disable recursion. */ - short recursion_level; - - /* XXX --- still unused -- */ - /** Show font preview. */ - short f_fp; - /** String to use for font preview. */ - char fp_str[8]; - - /* XXX --- end unused -- */ + /** Title, also used for the text of the execute button. */ + char title[96]; + /** + * Directory, FILE_MAX_LIBEXTRA, 1024 + 66, this is for extreme case when 1023 length path + * needs to be linked in, where foo.blend/Armature need adding + */ + char dir[1090]; + char file[256]; + + char renamefile[256]; + short rename_flag; + + /** List of filetypes to filter (FILE_MAXFILE). */ + char filter_glob[256]; + + /** Text items name must match to be shown. */ + char filter_search[64]; + /** Same as filter, but for ID types (aka library groups). */ + int filter_id; + + /** Active file used for keyboard navigation. */ + int active_file; + /** File under cursor. */ + int highlight_file; + int sel_first; + int sel_last; + unsigned short thumbnail_size; + char _pad1[2]; + + /* short */ + /** XXXXX for now store type here, should be moved to the operator. */ + short type; + /** Settings for filter, hiding dots files. */ + short flag; + /** Sort order. */ + short sort; + /** Display mode flag. */ + short display; + short display_previous; + /** Filter when (flags & FILE_FILTER) is true. */ + char _pad2[2]; + int filter; + + /** Max number of levels in dirtree to show at once, 0 to disable recursion. */ + short recursion_level; + + /* XXX --- still unused -- */ + /** Show font preview. */ + short f_fp; + /** String to use for font preview. */ + char fp_str[8]; + + /* XXX --- end unused -- */ } FileSelectParams; /* File Browser */ typedef struct SpaceFile { - SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; - /* End 'SpaceLink' header. */ - - char _pad1[4]; - int scroll_offset; - - /** Config and input for file select. */ - struct FileSelectParams *params; - - /** Holds the list of files to show. */ - struct FileList *files; - - /** Holds the list of previous directories to show. */ - ListBase *folders_prev; - /** Holds the list of next directories (pushed from previous) to show. */ - ListBase *folders_next; - - /* operator that is invoking fileselect - * op->exec() will be called on the 'Load' button. - * if operator provides op->cancel(), then this will be invoked - * on the cancel button. - */ - struct wmOperator *op; - - struct wmTimer *smoothscroll_timer; - struct wmTimer *previews_timer; - - struct FileLayout *layout; - - short recentnr, bookmarknr; - short systemnr, system_bookmarknr; + SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + + char _pad1[4]; + int scroll_offset; + + /** Config and input for file select. */ + struct FileSelectParams *params; + + /** Holds the list of files to show. */ + struct FileList *files; + + /** Holds the list of previous directories to show. */ + ListBase *folders_prev; + /** Holds the list of next directories (pushed from previous) to show. */ + ListBase *folders_next; + + /* operator that is invoking fileselect + * op->exec() will be called on the 'Load' button. + * if operator provides op->cancel(), then this will be invoked + * on the cancel button. + */ + struct wmOperator *op; + + struct wmTimer *smoothscroll_timer; + struct wmTimer *previews_timer; + + struct FileLayout *layout; + + short recentnr, bookmarknr; + short systemnr, system_bookmarknr; } SpaceFile; /* FileSelectParams.display */ enum eFileDisplayType { - FILE_DEFAULTDISPLAY = 0, - FILE_SHORTDISPLAY = 1, - FILE_LONGDISPLAY = 2, - FILE_IMGDISPLAY = 3, + FILE_DEFAULTDISPLAY = 0, + FILE_SHORTDISPLAY = 1, + FILE_LONGDISPLAY = 2, + FILE_IMGDISPLAY = 3, }; /* FileSelectParams.sort */ enum eFileSortType { - FILE_SORT_NONE = 0, - FILE_SORT_ALPHA = 1, - FILE_SORT_EXTENSION = 2, - FILE_SORT_TIME = 3, - FILE_SORT_SIZE = 4, + FILE_SORT_NONE = 0, + FILE_SORT_ALPHA = 1, + FILE_SORT_EXTENSION = 2, + FILE_SORT_TIME = 3, + FILE_SORT_SIZE = 4, }; /* these values need to be hardcoded in structs, dna does not recognize defines */ /* also defined in BKE */ -#define FILE_MAXDIR 768 -#define FILE_MAXFILE 256 -#define FILE_MAX 1024 +#define FILE_MAXDIR 768 +#define FILE_MAXFILE 256 +#define FILE_MAX 1024 -#define FILE_MAX_LIBEXTRA (FILE_MAX + MAX_ID_NAME) +#define FILE_MAX_LIBEXTRA (FILE_MAX + MAX_ID_NAME) /* filesel types */ -#define FILE_UNIX 8 -#define FILE_BLENDER 8 /* don't display relative paths */ -#define FILE_SPECIAL 9 +#define FILE_UNIX 8 +#define FILE_BLENDER 8 /* don't display relative paths */ +#define FILE_SPECIAL 9 -#define FILE_LOADLIB 1 -#define FILE_MAIN 2 +#define FILE_LOADLIB 1 +#define FILE_MAIN 2 /* filesel op property -> action */ typedef enum eFileSel_Action { - FILE_OPENFILE = 0, - FILE_SAVE = 1, + FILE_OPENFILE = 0, + FILE_SAVE = 1, } eFileSel_Action; /* sfile->params->flag */ /* Note: short flag, also used as 16 lower bits of flags in link/append code * (WM and BLO code area, see BLO_LibLinkFlags in BLO_readfile.h). */ typedef enum eFileSel_Params_Flag { - FILE_PARAMS_FLAG_UNUSED_1 = (1 << 0), /* cleared */ - FILE_RELPATH = (1 << 1), - FILE_LINK = (1 << 2), - FILE_HIDE_DOT = (1 << 3), - FILE_AUTOSELECT = (1 << 4), - FILE_ACTIVE_COLLECTION = (1 << 5), - FILE_PARAMS_FLAG_UNUSED_6 = (1 << 6), /* cleared */ - FILE_DIRSEL_ONLY = (1 << 7), - FILE_FILTER = (1 << 8), - FILE_PARAMS_FLAG_UNUSED_9 = (1 << 9), /* cleared */ - FILE_GROUP_INSTANCE = (1 << 10), + FILE_PARAMS_FLAG_UNUSED_1 = (1 << 0), /* cleared */ + FILE_RELPATH = (1 << 1), + FILE_LINK = (1 << 2), + FILE_HIDE_DOT = (1 << 3), + FILE_AUTOSELECT = (1 << 4), + FILE_ACTIVE_COLLECTION = (1 << 5), + FILE_PARAMS_FLAG_UNUSED_6 = (1 << 6), /* cleared */ + FILE_DIRSEL_ONLY = (1 << 7), + FILE_FILTER = (1 << 8), + FILE_PARAMS_FLAG_UNUSED_9 = (1 << 9), /* cleared */ + FILE_GROUP_INSTANCE = (1 << 10), } eFileSel_Params_Flag; /* sfile->params->rename_flag */ /* Note: short flag. Defined as bitflags, but currently only used as exclusive status markers... */ typedef enum eFileSel_Params_RenameFlag { - /* Used when we only have the name of the entry we want to rename, but not yet access to its matching file entry. */ - FILE_PARAMS_RENAME_PENDING = 1 << 0, - /* We are actually renaming an entry. */ - FILE_PARAMS_RENAME_ACTIVE = 1 << 1, - /* Used to scroll to newly renamed entry. */ - FILE_PARAMS_RENAME_POSTSCROLL_PENDING = 1 << 2, - FILE_PARAMS_RENAME_POSTSCROLL_ACTIVE = 1 << 3, + /* Used when we only have the name of the entry we want to rename, but not yet access to its matching file entry. */ + FILE_PARAMS_RENAME_PENDING = 1 << 0, + /* We are actually renaming an entry. */ + FILE_PARAMS_RENAME_ACTIVE = 1 << 1, + /* Used to scroll to newly renamed entry. */ + FILE_PARAMS_RENAME_POSTSCROLL_PENDING = 1 << 2, + FILE_PARAMS_RENAME_POSTSCROLL_ACTIVE = 1 << 3, } eFileSel_Params_RenameFlag; /* files in filesel list: file types @@ -799,35 +788,35 @@ typedef enum eFileSel_Params_RenameFlag { * but since we do not lack of bytes currently... */ typedef enum eFileSel_File_Types { - FILE_TYPE_BLENDER = (1 << 2), - FILE_TYPE_BLENDER_BACKUP = (1 << 3), - FILE_TYPE_IMAGE = (1 << 4), - FILE_TYPE_MOVIE = (1 << 5), - FILE_TYPE_PYSCRIPT = (1 << 6), - 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... */ - /** represents folders for filtering */ - FILE_TYPE_FOLDER = (1 << 11), - FILE_TYPE_BTX = (1 << 12), - FILE_TYPE_COLLADA = (1 << 13), - /** from filter_glob operator property */ - FILE_TYPE_OPERATOR = (1 << 14), - FILE_TYPE_APPLICATIONBUNDLE = (1 << 15), - FILE_TYPE_ALEMBIC = (1 << 16), - - /** An FS directory (i.e. S_ISDIR on its path is true). */ - FILE_TYPE_DIR = (1 << 30), - FILE_TYPE_BLENDERLIB = (1u << 31), + FILE_TYPE_BLENDER = (1 << 2), + FILE_TYPE_BLENDER_BACKUP = (1 << 3), + FILE_TYPE_IMAGE = (1 << 4), + FILE_TYPE_MOVIE = (1 << 5), + FILE_TYPE_PYSCRIPT = (1 << 6), + 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... */ + /** represents folders for filtering */ + FILE_TYPE_FOLDER = (1 << 11), + FILE_TYPE_BTX = (1 << 12), + FILE_TYPE_COLLADA = (1 << 13), + /** from filter_glob operator property */ + FILE_TYPE_OPERATOR = (1 << 14), + FILE_TYPE_APPLICATIONBUNDLE = (1 << 15), + FILE_TYPE_ALEMBIC = (1 << 16), + + /** An FS directory (i.e. S_ISDIR on its path is true). */ + FILE_TYPE_DIR = (1 << 30), + FILE_TYPE_BLENDERLIB = (1u << 31), } eFileSel_File_Types; /* Selection Flags in filesel: struct direntry, unsigned char selflag */ typedef enum eDirEntry_SelectFlag { -/* FILE_SEL_ACTIVE = (1 << 1), */ /* UNUSED */ - FILE_SEL_HIGHLIGHTED = (1 << 2), - FILE_SEL_SELECTED = (1 << 3), - FILE_SEL_EDITING = (1 << 4), + /* FILE_SEL_ACTIVE = (1 << 1), */ /* UNUSED */ + FILE_SEL_HIGHLIGHTED = (1 << 2), + FILE_SEL_SELECTED = (1 << 3), + FILE_SEL_EDITING = (1 << 4), } eDirEntry_SelectFlag; /* ***** Related to file browser, but never saved in DNA, only here to help with RNA. ***** */ @@ -838,42 +827,42 @@ typedef enum eDirEntry_SelectFlag { * asset/variant/version (concatenating the three into a single 48 bytes one). * Assumed to be 128bits, handled as four integers due to lack of real bytes proptype in RNA :|. */ -#define ASSET_UUID_LENGTH 16 +#define ASSET_UUID_LENGTH 16 /* Used to communicate with asset engines outside of 'import' context. */ # # typedef struct AssetUUID { - int uuid_asset[4]; - int uuid_variant[4]; - int uuid_revision[4]; + int uuid_asset[4]; + int uuid_variant[4]; + int uuid_revision[4]; } AssetUUID; # # typedef struct AssetUUIDList { - AssetUUID *uuids; - int nbr_uuids; - char _pad[4]; + AssetUUID *uuids; + int nbr_uuids; + char _pad[4]; } AssetUUIDList; /* Container for a revision, only relevant in asset context. */ # # typedef struct FileDirEntryRevision { - struct FileDirEntryRevision *next, *prev; + struct FileDirEntryRevision *next, *prev; - char *comment; - void *_pad; + char *comment; + void *_pad; - int uuid[4]; + int uuid[4]; - uint64_t size; - int64_t time; - /* Temp caching of UI-generated strings... */ - char size_str[16]; - char time_str[8]; - char date_str[16]; + uint64_t size; + int64_t time; + /* Temp caching of UI-generated strings... */ + char size_str[16]; + char time_str[8]; + char date_str[16]; } FileDirEntryRevision; /* Container for a variant, only relevant in asset context. @@ -881,52 +870,52 @@ typedef struct FileDirEntryRevision { # # typedef struct FileDirEntryVariant { - struct FileDirEntryVariant *next, *prev; + struct FileDirEntryVariant *next, *prev; - int uuid[4]; - char *name; - char *description; + int uuid[4]; + char *name; + char *description; - ListBase revisions; - int nbr_revisions; - int act_revision; + ListBase revisions; + int nbr_revisions; + int act_revision; } FileDirEntryVariant; /* Container for mere direntry, with additional asset-related data. */ # # typedef struct FileDirEntry { - struct FileDirEntry *next, *prev; + struct FileDirEntry *next, *prev; - int uuid[4]; - char *name; - char *description; + int uuid[4]; + char *name; + char *description; - /* Either point to active variant/revision if available, or own entry - * (in mere filebrowser case). */ - FileDirEntryRevision *entry; + /* Either point to active variant/revision if available, or own entry + * (in mere filebrowser case). */ + FileDirEntryRevision *entry; - /** #eFileSel_File_Types. */ - int typeflag; - /** ID type, in case typeflag has FILE_TYPE_BLENDERLIB set. */ - int blentype; + /** #eFileSel_File_Types. */ + int typeflag; + /** ID type, in case typeflag has FILE_TYPE_BLENDERLIB set. */ + int blentype; - char *relpath; + char *relpath; - /** TODO: make this a real ID pointer? */ - void *poin; - struct ImBuf *image; + /** TODO: make this a real ID pointer? */ + void *poin; + struct ImBuf *image; - /* Tags are for info only, most of filtering is done in asset engine. */ - char **tags; - int nbr_tags; + /* Tags are for info only, most of filtering is done in asset engine. */ + char **tags; + int nbr_tags; - short status; - short flags; + short status; + short flags; - ListBase variants; - int nbr_variants; - int act_variant; + ListBase variants; + int nbr_variants; + int act_variant; } FileDirEntry; /* Array of direntries. */ @@ -939,24 +928,24 @@ typedef struct FileDirEntry { # # typedef struct FileDirEntryArr { - ListBase entries; - int nbr_entries; - int nbr_entries_filtered; - int entry_idx_start, entry_idx_end; + ListBase entries; + int nbr_entries; + int nbr_entries_filtered; + int entry_idx_start, entry_idx_end; - /** FILE_MAX. */ - char root[1024]; + /** FILE_MAX. */ + char root[1024]; } FileDirEntryArr; /* FileDirEntry.status */ enum { - ASSET_STATUS_LOCAL = 1 << 0, /* If active uuid is available locally/immediately. */ - ASSET_STATUS_LATEST = 1 << 1, /* If active uuid is latest available version. */ + ASSET_STATUS_LOCAL = 1 << 0, /* If active uuid is available locally/immediately. */ + ASSET_STATUS_LATEST = 1 << 1, /* If active uuid is latest available version. */ }; /* FileDirEntry.flags */ enum { - FILE_ENTRY_INVALID_PREVIEW = 1 << 0, /* The preview for this entry could not be generated. */ + FILE_ENTRY_INVALID_PREVIEW = 1 << 0, /* The preview for this entry could not be generated. */ }; /** \} */ @@ -967,151 +956,150 @@ enum { /* Image/UV Editor */ typedef struct SpaceImage { - SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; - /* End 'SpaceLink' header. */ - - struct Image *image; - struct ImageUser iuser; - - /** Histogram waveform and vectorscope. */ - struct Scopes scopes; - /** Sample line histogram. */ - struct Histogram sample_line_hist; - - /** Grease pencil data. */ - struct bGPdata *gpd; - - /** UV editor 2d cursor. */ - float cursor[2]; - /** User defined offset, image is centered. */ - float xof, yof; - /** User defined zoom level. */ - float zoom; - /** Storage for offset while render drawing. */ - float centx, centy; - - /** View/paint/mask. */ - char mode; - /* Storage for sub-space types. */ - char mode_prev; - - char pin; - char _pad1; - /** - * The currently active tile of the image when tile is enabled, - * is kept in sync with the active faces tile. - */ - short curtile; - short lock; - /** UV draw type. */ - char dt_uv; - /** Sticky selection type. */ - char sticky; - char dt_uvstretch; - char around; - - int flag; - - char pixel_snap_mode; - char _pad2[3]; - - MaskSpaceInfo mask_info; + SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + + struct Image *image; + struct ImageUser iuser; + + /** Histogram waveform and vectorscope. */ + struct Scopes scopes; + /** Sample line histogram. */ + struct Histogram sample_line_hist; + + /** Grease pencil data. */ + struct bGPdata *gpd; + + /** UV editor 2d cursor. */ + float cursor[2]; + /** User defined offset, image is centered. */ + float xof, yof; + /** User defined zoom level. */ + float zoom; + /** Storage for offset while render drawing. */ + float centx, centy; + + /** View/paint/mask. */ + char mode; + /* Storage for sub-space types. */ + char mode_prev; + + char pin; + char _pad1; + /** + * The currently active tile of the image when tile is enabled, + * is kept in sync with the active faces tile. + */ + short curtile; + short lock; + /** UV draw type. */ + char dt_uv; + /** Sticky selection type. */ + char sticky; + char dt_uvstretch; + char around; + + int flag; + + char pixel_snap_mode; + char _pad2[3]; + + MaskSpaceInfo mask_info; } SpaceImage; - /* SpaceImage.dt_uv */ typedef enum eSpaceImage_UVDT { - SI_UVDT_OUTLINE = 0, - SI_UVDT_DASH = 1, - SI_UVDT_BLACK = 2, - SI_UVDT_WHITE = 3, + SI_UVDT_OUTLINE = 0, + SI_UVDT_DASH = 1, + SI_UVDT_BLACK = 2, + SI_UVDT_WHITE = 3, } eSpaceImage_UVDT; /* SpaceImage.dt_uvstretch */ typedef enum eSpaceImage_UVDT_Stretch { - SI_UVDT_STRETCH_ANGLE = 0, - SI_UVDT_STRETCH_AREA = 1, + SI_UVDT_STRETCH_ANGLE = 0, + SI_UVDT_STRETCH_AREA = 1, } eSpaceImage_UVDT_Stretch; /* SpaceImage.pixel_snap_mode */ typedef enum eSpaceImage_PixelSnapMode { - SI_PIXEL_SNAP_DISABLED = 0, - SI_PIXEL_SNAP_CENTER = 1, - SI_PIXEL_SNAP_CORNER = 2, + SI_PIXEL_SNAP_DISABLED = 0, + SI_PIXEL_SNAP_CENTER = 1, + SI_PIXEL_SNAP_CORNER = 2, } eSpaceImage_Snap_Mode; /* SpaceImage.mode */ typedef enum eSpaceImage_Mode { - SI_MODE_VIEW = 0, - SI_MODE_PAINT = 1, - SI_MODE_MASK = 2, - SI_MODE_UV = 3, + SI_MODE_VIEW = 0, + SI_MODE_PAINT = 1, + SI_MODE_MASK = 2, + SI_MODE_UV = 3, } eSpaceImage_Mode; /* SpaceImage.sticky * Note DISABLE should be 0, however would also need to re-arrange icon order, * also, sticky loc is the default mode so this means we don't need to 'do_versions' */ typedef enum eSpaceImage_Sticky { - SI_STICKY_LOC = 0, - SI_STICKY_DISABLE = 1, - SI_STICKY_VERTEX = 2, + SI_STICKY_LOC = 0, + SI_STICKY_DISABLE = 1, + SI_STICKY_VERTEX = 2, } eSpaceImage_Sticky; /* SpaceImage.flag */ typedef enum eSpaceImage_Flag { - SI_FLAG_UNUSED_0 = (1 << 0), /* cleared */ - SI_FLAG_UNUSED_1 = (1 << 1), /* cleared */ - SI_CLIP_UV = (1 << 2), - SI_FLAG_UNUSED_3 = (1 << 3), /* cleared */ - SI_NO_DRAWFACES = (1 << 4), - SI_DRAWSHADOW = (1 << 5), - SI_FLAG_UNUSED_6 = (1 << 6), /* cleared */ - SI_FLAG_UNUSED_7 = (1 << 7), /* cleared */ - SI_FLAG_UNUSED_8 = (1 << 8), /* cleared */ - SI_COORDFLOATS = (1 << 9), - SI_FLAG_UNUSED_10 = (1 << 10), - SI_LIVE_UNWRAP = (1 << 11), - SI_USE_ALPHA = (1 << 12), - SI_SHOW_ALPHA = (1 << 13), - SI_SHOW_ZBUF = (1 << 14), - - /* next two for render window display */ - SI_PREVSPACE = (1 << 15), - SI_FULLWINDOW = (1 << 16), - - SI_FLAG_UNUSED_17 = (1 << 17), /* cleared */ - SI_FLAG_UNUSED_18 = (1 << 18), /* cleared */ - - /* this means that the image is drawn until it reaches the view edge, - * in the image view, it's unrelated to the 'tile' mode for texface - */ - SI_DRAW_TILE = (1 << 19), - SI_SMOOTH_UV = (1 << 20), - SI_DRAW_STRETCH = (1 << 21), - SI_SHOW_GPENCIL = (1 << 22), - SI_FLAG_UNUSED_23 = (1 << 23), /* cleared */ - - SI_FLAG_UNUSED_24 = (1 << 24), - - SI_NO_DRAW_TEXPAINT = (1 << 25), - SI_DRAW_METADATA = (1 << 26), - - SI_SHOW_R = (1 << 27), - SI_SHOW_G = (1 << 28), - SI_SHOW_B = (1 << 29), - - SI_NO_DRAWEDGES = (1 << 30), + SI_FLAG_UNUSED_0 = (1 << 0), /* cleared */ + SI_FLAG_UNUSED_1 = (1 << 1), /* cleared */ + SI_CLIP_UV = (1 << 2), + SI_FLAG_UNUSED_3 = (1 << 3), /* cleared */ + SI_NO_DRAWFACES = (1 << 4), + SI_DRAWSHADOW = (1 << 5), + SI_FLAG_UNUSED_6 = (1 << 6), /* cleared */ + SI_FLAG_UNUSED_7 = (1 << 7), /* cleared */ + SI_FLAG_UNUSED_8 = (1 << 8), /* cleared */ + SI_COORDFLOATS = (1 << 9), + SI_FLAG_UNUSED_10 = (1 << 10), + SI_LIVE_UNWRAP = (1 << 11), + SI_USE_ALPHA = (1 << 12), + SI_SHOW_ALPHA = (1 << 13), + SI_SHOW_ZBUF = (1 << 14), + + /* next two for render window display */ + SI_PREVSPACE = (1 << 15), + SI_FULLWINDOW = (1 << 16), + + SI_FLAG_UNUSED_17 = (1 << 17), /* cleared */ + SI_FLAG_UNUSED_18 = (1 << 18), /* cleared */ + + /* this means that the image is drawn until it reaches the view edge, + * in the image view, it's unrelated to the 'tile' mode for texface + */ + SI_DRAW_TILE = (1 << 19), + SI_SMOOTH_UV = (1 << 20), + SI_DRAW_STRETCH = (1 << 21), + SI_SHOW_GPENCIL = (1 << 22), + SI_FLAG_UNUSED_23 = (1 << 23), /* cleared */ + + SI_FLAG_UNUSED_24 = (1 << 24), + + SI_NO_DRAW_TEXPAINT = (1 << 25), + SI_DRAW_METADATA = (1 << 26), + + SI_SHOW_R = (1 << 27), + SI_SHOW_G = (1 << 28), + SI_SHOW_B = (1 << 29), + + SI_NO_DRAWEDGES = (1 << 30), } eSpaceImage_Flag; /* SpaceImage.other_uv_filter */ typedef enum eSpaceImage_OtherUVFilter { - SI_FILTER_SAME_IMAGE = 0, - SI_FILTER_ALL = 1, + SI_FILTER_SAME_IMAGE = 0, + SI_FILTER_ALL = 1, } eSpaceImage_OtherUVFilter; /** \} */ @@ -1122,77 +1110,76 @@ typedef enum eSpaceImage_OtherUVFilter { /* Text Editor */ typedef struct SpaceText { - SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; - /* End 'SpaceLink' header. */ - - struct Text *text; - - int top, viewlines; - short flags, menunr; - - /** User preference, is font_size! */ - short lheight; - /** - * Runtime computed, character width - * and the number of chars to use when showing line numbers. - */ - char cwidth, linenrs_tot; - int left; - int showlinenrs; - int tabnumber; - - short showsyntax; - short line_hlight; - short overwrite; - /** Run python while editing, evil. */ - short live_edit; - float pix_per_line; - - struct rcti txtscroll, txtbar; - - int wordwrap, doplugins; - - /** ST_MAX_FIND_STR. */ - char findstr[256]; - /** ST_MAX_FIND_STR. */ - char replacestr[256]; - - /** Column number to show right margin at. */ - short margin_column; - /** Actual lineheight, dpi controlled. */ - short lheight_dpi; - char _pad[4]; - - /** Cache for faster drawing. */ - void *drawcache; - - /** Runtime, for scroll increments smaller than a line. */ - float scroll_accum[2]; + SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + + struct Text *text; + + int top, viewlines; + short flags, menunr; + + /** User preference, is font_size! */ + short lheight; + /** + * Runtime computed, character width + * and the number of chars to use when showing line numbers. + */ + char cwidth, linenrs_tot; + int left; + int showlinenrs; + int tabnumber; + + short showsyntax; + short line_hlight; + short overwrite; + /** Run python while editing, evil. */ + short live_edit; + float pix_per_line; + + struct rcti txtscroll, txtbar; + + int wordwrap, doplugins; + + /** ST_MAX_FIND_STR. */ + char findstr[256]; + /** ST_MAX_FIND_STR. */ + char replacestr[256]; + + /** Column number to show right margin at. */ + short margin_column; + /** Actual lineheight, dpi controlled. */ + short lheight_dpi; + char _pad[4]; + + /** Cache for faster drawing. */ + void *drawcache; + + /** Runtime, for scroll increments smaller than a line. */ + float scroll_accum[2]; } SpaceText; - /* SpaceText flags (moved from DNA_text_types.h) */ typedef enum eSpaceText_Flags { - /* scrollable */ - ST_SCROLL_SELECT = (1 << 0), - /* clear namespace after script execution (BPY_main.c) */ - ST_CLEAR_NAMESPACE = (1 << 4), + /* scrollable */ + ST_SCROLL_SELECT = (1 << 0), + /* clear namespace after script execution (BPY_main.c) */ + ST_CLEAR_NAMESPACE = (1 << 4), - ST_FIND_WRAP = (1 << 5), - ST_FIND_ALL = (1 << 6), - ST_SHOW_MARGIN = (1 << 7), - ST_MATCH_CASE = (1 << 8), + ST_FIND_WRAP = (1 << 5), + ST_FIND_ALL = (1 << 6), + ST_SHOW_MARGIN = (1 << 7), + ST_MATCH_CASE = (1 << 8), - ST_FIND_ACTIVATE = (1 << 9), + ST_FIND_ACTIVATE = (1 << 9), } eSpaceText_Flags; /* SpaceText.findstr/replacestr */ -#define ST_MAX_FIND_STR 256 +#define ST_MAX_FIND_STR 256 /** \} */ @@ -1202,42 +1189,45 @@ typedef enum eSpaceText_Flags { /* Script Runtime Data - Obsolete (pre 2.5) */ typedef struct Script { - ID id; - - void *py_draw; - void *py_event; - void *py_button; - void *py_browsercallback; - void *py_globaldict; - - int flags, lastspace; - /** - * Store the script file here so we can re-run it on loading blender, - * if "Enable Scripts" is on - */ - /** 1024 = FILE_MAX. */ - char scriptname[1024]; - /** 1024 = FILE_MAX. */ - char scriptarg[256]; + ID id; + + void *py_draw; + void *py_event; + void *py_button; + void *py_browsercallback; + void *py_globaldict; + + int flags, lastspace; + /** + * Store the script file here so we can re-run it on loading blender, + * if "Enable Scripts" is on + */ + /** 1024 = FILE_MAX. */ + char scriptname[1024]; + /** 1024 = FILE_MAX. */ + char scriptarg[256]; } Script; -#define SCRIPT_SET_NULL(_script) _script->py_draw = _script->py_event = _script->py_button = _script->py_browsercallback = _script->py_globaldict = NULL; _script->flags = 0 +#define SCRIPT_SET_NULL(_script) \ + _script->py_draw = _script->py_event = _script->py_button = _script->py_browsercallback = \ + _script->py_globaldict = NULL; \ + _script->flags = 0 /* Script View - Obsolete (pre 2.5) */ typedef struct SpaceScript { - SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; - /* End 'SpaceLink' header. */ + SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ - struct Script *script; + struct Script *script; - short flags, menunr; - char _pad1[4]; + short flags, menunr; + char _pad1[4]; - void *but_refs; + void *but_refs; } SpaceScript; /** \} */ @@ -1247,120 +1237,120 @@ typedef struct SpaceScript { * \{ */ typedef struct bNodeTreePath { - struct bNodeTreePath *next, *prev; + struct bNodeTreePath *next, *prev; - struct bNodeTree *nodetree; - /** Base key for nodes in this tree instance. */ - bNodeInstanceKey parent_key; - char _pad[4]; - /** V2d center point, so node trees can have different offsets in editors. */ - float view_center[2]; + struct bNodeTree *nodetree; + /** Base key for nodes in this tree instance. */ + bNodeInstanceKey parent_key; + char _pad[4]; + /** V2d center point, so node trees can have different offsets in editors. */ + float view_center[2]; - /** MAX_NAME. */ - char node_name[64]; + /** MAX_NAME. */ + char node_name[64]; } bNodeTreePath; typedef struct SpaceNode { - SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; - /* End 'SpaceLink' header. */ - - /** Deprecated, copied to region. */ - View2D v2d DNA_DEPRECATED; - - /** Context, no need to save in file? well... pinning... */ - struct ID *id, *from; - /** Menunr: browse id block in header. */ - short flag; - char _pad1[2]; - /** Internal state variables. */ - float aspect; - char _pad2[4]; - - /** Offset for drawing the backdrop. */ - float xof, yof; - /** Zoom for backdrop. */ - float zoom; - /** Mouse pos for drawing socketless link and adding nodes. */ - float cursor[2]; - - /* XXX nodetree pointer info is all in the path stack now, - * remove later on and use bNodeTreePath instead. For now these variables are set when pushing/popping - * from path stack, to avoid having to update all the functions and operators. Can be done when - * design is accepted and everything is properly tested. - */ - ListBase treepath; - - struct bNodeTree *nodetree, *edittree; - - /* tree type for the current node tree */ - char tree_idname[64]; - /** Treetype: as same nodetree->type. */ - int treetype DNA_DEPRECATED; - char _pad3[4]; - - /** Texfrom object, world or brush. */ - short texfrom; - /** Shader from object or world. */ - short shaderfrom; - /** Currently on 0/1, for auto compo. */ - short recalc; - - /** Direction for offsetting nodes on insertion. */ - char insert_ofs_dir; - char _pad4; - - /** Temporary data for modal linking operator. */ - ListBase linkdrag; - /* XXX hack for translate_attach op-macros to pass data from transform op to insert_offset op */ - /** Temporary data for node insert offset (in UI called Auto-offset). */ - struct NodeInsertOfsData *iofsd; - - /** Grease-pencil data. */ - struct bGPdata *gpd; + SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + + /** Deprecated, copied to region. */ + View2D v2d DNA_DEPRECATED; + + /** Context, no need to save in file? well... pinning... */ + struct ID *id, *from; + /** Menunr: browse id block in header. */ + short flag; + char _pad1[2]; + /** Internal state variables. */ + float aspect; + char _pad2[4]; + + /** Offset for drawing the backdrop. */ + float xof, yof; + /** Zoom for backdrop. */ + float zoom; + /** Mouse pos for drawing socketless link and adding nodes. */ + float cursor[2]; + + /* XXX nodetree pointer info is all in the path stack now, + * remove later on and use bNodeTreePath instead. For now these variables are set when pushing/popping + * from path stack, to avoid having to update all the functions and operators. Can be done when + * design is accepted and everything is properly tested. + */ + ListBase treepath; + + struct bNodeTree *nodetree, *edittree; + + /* tree type for the current node tree */ + char tree_idname[64]; + /** Treetype: as same nodetree->type. */ + int treetype DNA_DEPRECATED; + char _pad3[4]; + + /** Texfrom object, world or brush. */ + short texfrom; + /** Shader from object or world. */ + short shaderfrom; + /** Currently on 0/1, for auto compo. */ + short recalc; + + /** Direction for offsetting nodes on insertion. */ + char insert_ofs_dir; + char _pad4; + + /** Temporary data for modal linking operator. */ + ListBase linkdrag; + /* XXX hack for translate_attach op-macros to pass data from transform op to insert_offset op */ + /** Temporary data for node insert offset (in UI called Auto-offset). */ + struct NodeInsertOfsData *iofsd; + + /** Grease-pencil data. */ + struct bGPdata *gpd; } SpaceNode; /* SpaceNode.flag */ typedef enum eSpaceNode_Flag { - SNODE_BACKDRAW = (1 << 1), - SNODE_SHOW_GPENCIL = (1 << 2), - SNODE_USE_ALPHA = (1 << 3), - SNODE_SHOW_ALPHA = (1 << 4), - SNODE_SHOW_R = (1 << 7), - SNODE_SHOW_G = (1 << 8), - SNODE_SHOW_B = (1 << 9), - SNODE_AUTO_RENDER = (1 << 5), - SNODE_FLAG_UNUSED_6 = (1 << 6), /* cleared */ - SNODE_FLAG_UNUSED_10 = (1 << 10), /* cleared */ - SNODE_FLAG_UNUSED_11 = (1 << 11), /* cleared */ - SNODE_PIN = (1 << 12), - /** automatically offset following nodes in a chain on insertion */ - SNODE_SKIP_INSOFFSET = (1 << 13), + SNODE_BACKDRAW = (1 << 1), + SNODE_SHOW_GPENCIL = (1 << 2), + SNODE_USE_ALPHA = (1 << 3), + SNODE_SHOW_ALPHA = (1 << 4), + SNODE_SHOW_R = (1 << 7), + SNODE_SHOW_G = (1 << 8), + SNODE_SHOW_B = (1 << 9), + SNODE_AUTO_RENDER = (1 << 5), + SNODE_FLAG_UNUSED_6 = (1 << 6), /* cleared */ + SNODE_FLAG_UNUSED_10 = (1 << 10), /* cleared */ + SNODE_FLAG_UNUSED_11 = (1 << 11), /* cleared */ + SNODE_PIN = (1 << 12), + /** automatically offset following nodes in a chain on insertion */ + SNODE_SKIP_INSOFFSET = (1 << 13), } eSpaceNode_Flag; /* SpaceNode.texfrom */ typedef enum eSpaceNode_TexFrom { - /* SNODE_TEX_OBJECT = 0, */ - SNODE_TEX_WORLD = 1, - SNODE_TEX_BRUSH = 2, - SNODE_TEX_LINESTYLE = 3, + /* SNODE_TEX_OBJECT = 0, */ + SNODE_TEX_WORLD = 1, + SNODE_TEX_BRUSH = 2, + SNODE_TEX_LINESTYLE = 3, } eSpaceNode_TexFrom; /* SpaceNode.shaderfrom */ typedef enum eSpaceNode_ShaderFrom { - SNODE_SHADER_OBJECT = 0, - SNODE_SHADER_WORLD = 1, - SNODE_SHADER_LINESTYLE = 2, + SNODE_SHADER_OBJECT = 0, + SNODE_SHADER_WORLD = 1, + SNODE_SHADER_LINESTYLE = 2, } eSpaceNode_ShaderFrom; /* SpaceNode.insert_ofs_dir */ enum { - SNODE_INSERTOFS_DIR_RIGHT = 0, - SNODE_INSERTOFS_DIR_LEFT = 1, + SNODE_INSERTOFS_DIR_RIGHT = 0, + SNODE_INSERTOFS_DIR_LEFT = 1, }; /** \} */ @@ -1371,53 +1361,52 @@ enum { /* Console content */ typedef struct ConsoleLine { - struct ConsoleLine *next, *prev; - - /* keep these 3 vars so as to share free, realloc funcs */ - /** Allocated length. */ - int len_alloc; - /** Real len - strlen(). */ - int len; - char *line; - - int cursor; - /** Only for use when in the 'scrollback' listbase. */ - int type; + struct ConsoleLine *next, *prev; + + /* keep these 3 vars so as to share free, realloc funcs */ + /** Allocated length. */ + int len_alloc; + /** Real len - strlen(). */ + int len; + char *line; + + int cursor; + /** Only for use when in the 'scrollback' listbase. */ + int type; } ConsoleLine; /* ConsoleLine.type */ typedef enum eConsoleLine_Type { - CONSOLE_LINE_OUTPUT = 0, - CONSOLE_LINE_INPUT = 1, - CONSOLE_LINE_INFO = 2, /* autocomp feedback */ - CONSOLE_LINE_ERROR = 3, + CONSOLE_LINE_OUTPUT = 0, + CONSOLE_LINE_INPUT = 1, + CONSOLE_LINE_INFO = 2, /* autocomp feedback */ + CONSOLE_LINE_ERROR = 3, } eConsoleLine_Type; - /* Console View */ typedef struct SpaceConsole { - SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; - /* End 'SpaceLink' header. */ - - /* space vars */ - int lheight; - char _pad[4]; - - /** ConsoleLine; output. */ - ListBase scrollback; - /** ConsoleLine; command history, current edited line is the first. */ - ListBase history; - char prompt[256]; - /** Multiple consoles are possible, not just python. */ - char language[32]; - - int sel_start; - int sel_end; + SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + + /* space vars */ + int lheight; + char _pad[4]; + + /** ConsoleLine; output. */ + ListBase scrollback; + /** ConsoleLine; command history, current edited line is the first. */ + ListBase history; + char prompt[256]; + /** Multiple consoles are possible, not just python. */ + char language[32]; + + int sel_start; + int sel_end; } SpaceConsole; /** \} */ @@ -1427,18 +1416,18 @@ typedef struct SpaceConsole { * \{ */ typedef struct SpaceUserPref { - SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; - /* End 'SpaceLink' header. */ - - char _pad1[7]; - char filter_type; - /** Search term for filtering in the UI. */ - char filter[64]; + SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + + char _pad1[7]; + char filter_type; + /** Search term for filtering in the UI. */ + char filter[64]; } SpaceUserPref; /** \} */ @@ -1449,116 +1438,115 @@ typedef struct SpaceUserPref { /* Clip Editor */ typedef struct SpaceClip { - SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; - /* End 'SpaceLink' header. */ - - char _pad1[4]; - - /** User defined offset, image is centered. */ - float xof, yof; - /** User defined offset from locked position. */ - float xlockof, ylockof; - /** User defined zoom level. */ - float zoom; - - /** User of clip. */ - struct MovieClipUser user; - /** Clip data. */ - struct MovieClip *clip; - /** Different scoped displayed in space panels. */ - struct MovieClipScopes scopes; - - /** Flags. */ - int flag; - /** Editor mode (editing context being displayed). */ - short mode; - /** Type of the clip editor view. */ - short view; - - /** Length of displaying path, in frames. */ - int path_length; - - /* current stabilization data */ - /** Pre-composed stabilization data. */ - float loc[2], scale, angle; - char _pad[4]; - /** - * Current stabilization matrix and the same matrix in unified space, - * defined when drawing and used for mouse position calculation. - */ - float stabmat[4][4], unistabmat[4][4]; - - /* movie postprocessing */ - int postproc_flag; - - /* grease pencil */ - short gpencil_src; - char _pad2[2]; - - /** Pivot point for transforms. */ - int around; - char _pad4[4]; - - /** Mask editor 2d cursor. */ - float cursor[2]; - - MaskSpaceInfo mask_info; + SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ + + char _pad1[4]; + + /** User defined offset, image is centered. */ + float xof, yof; + /** User defined offset from locked position. */ + float xlockof, ylockof; + /** User defined zoom level. */ + float zoom; + + /** User of clip. */ + struct MovieClipUser user; + /** Clip data. */ + struct MovieClip *clip; + /** Different scoped displayed in space panels. */ + struct MovieClipScopes scopes; + + /** Flags. */ + int flag; + /** Editor mode (editing context being displayed). */ + short mode; + /** Type of the clip editor view. */ + short view; + + /** Length of displaying path, in frames. */ + int path_length; + + /* current stabilization data */ + /** Pre-composed stabilization data. */ + float loc[2], scale, angle; + char _pad[4]; + /** + * Current stabilization matrix and the same matrix in unified space, + * defined when drawing and used for mouse position calculation. + */ + float stabmat[4][4], unistabmat[4][4]; + + /* movie postprocessing */ + int postproc_flag; + + /* grease pencil */ + short gpencil_src; + char _pad2[2]; + + /** Pivot point for transforms. */ + int around; + char _pad4[4]; + + /** Mask editor 2d cursor. */ + float cursor[2]; + + MaskSpaceInfo mask_info; } SpaceClip; /* SpaceClip.flag */ typedef enum eSpaceClip_Flag { - SC_SHOW_MARKER_PATTERN = (1 << 0), - SC_SHOW_MARKER_SEARCH = (1 << 1), - SC_LOCK_SELECTION = (1 << 2), - SC_SHOW_TINY_MARKER = (1 << 3), - SC_SHOW_TRACK_PATH = (1 << 4), - SC_SHOW_BUNDLES = (1 << 5), - SC_MUTE_FOOTAGE = (1 << 6), - SC_HIDE_DISABLED = (1 << 7), - SC_SHOW_NAMES = (1 << 8), - SC_SHOW_GRID = (1 << 9), - SC_SHOW_STABLE = (1 << 10), - SC_MANUAL_CALIBRATION = (1 << 11), - SC_SHOW_ANNOTATION = (1 << 12), - SC_SHOW_FILTERS = (1 << 13), - SC_SHOW_GRAPH_FRAMES = (1 << 14), - SC_SHOW_GRAPH_TRACKS_MOTION = (1 << 15), -/* SC_SHOW_PYRAMID_LEVELS = (1 << 16), */ /* UNUSED */ - SC_LOCK_TIMECURSOR = (1 << 17), - SC_SHOW_SECONDS = (1 << 18), - SC_SHOW_GRAPH_SEL_ONLY = (1 << 19), - SC_SHOW_GRAPH_HIDDEN = (1 << 20), - SC_SHOW_GRAPH_TRACKS_ERROR = (1 << 21), - SC_SHOW_METADATA = (1 << 22), + SC_SHOW_MARKER_PATTERN = (1 << 0), + SC_SHOW_MARKER_SEARCH = (1 << 1), + SC_LOCK_SELECTION = (1 << 2), + SC_SHOW_TINY_MARKER = (1 << 3), + SC_SHOW_TRACK_PATH = (1 << 4), + SC_SHOW_BUNDLES = (1 << 5), + SC_MUTE_FOOTAGE = (1 << 6), + SC_HIDE_DISABLED = (1 << 7), + SC_SHOW_NAMES = (1 << 8), + SC_SHOW_GRID = (1 << 9), + SC_SHOW_STABLE = (1 << 10), + SC_MANUAL_CALIBRATION = (1 << 11), + SC_SHOW_ANNOTATION = (1 << 12), + SC_SHOW_FILTERS = (1 << 13), + SC_SHOW_GRAPH_FRAMES = (1 << 14), + SC_SHOW_GRAPH_TRACKS_MOTION = (1 << 15), + /* SC_SHOW_PYRAMID_LEVELS = (1 << 16), */ /* UNUSED */ + SC_LOCK_TIMECURSOR = (1 << 17), + SC_SHOW_SECONDS = (1 << 18), + SC_SHOW_GRAPH_SEL_ONLY = (1 << 19), + SC_SHOW_GRAPH_HIDDEN = (1 << 20), + SC_SHOW_GRAPH_TRACKS_ERROR = (1 << 21), + SC_SHOW_METADATA = (1 << 22), } eSpaceClip_Flag; /* SpaceClip.mode */ typedef enum eSpaceClip_Mode { - SC_MODE_TRACKING = 0, - /*SC_MODE_RECONSTRUCTION = 1,*/ /* DEPRECATED */ - /*SC_MODE_DISTORTION = 2,*/ /* DEPRECATED */ - SC_MODE_MASKEDIT = 3, + SC_MODE_TRACKING = 0, + /*SC_MODE_RECONSTRUCTION = 1,*/ /* DEPRECATED */ + /*SC_MODE_DISTORTION = 2,*/ /* DEPRECATED */ + SC_MODE_MASKEDIT = 3, } eSpaceClip_Mode; /* SpaceClip.view */ typedef enum eSpaceClip_View { - SC_VIEW_CLIP = 0, - SC_VIEW_GRAPH = 1, - SC_VIEW_DOPESHEET = 2, + SC_VIEW_CLIP = 0, + SC_VIEW_GRAPH = 1, + SC_VIEW_DOPESHEET = 2, } eSpaceClip_View; /* SpaceClip.gpencil_src */ typedef enum eSpaceClip_GPencil_Source { - SC_GPENCIL_SRC_CLIP = 0, - SC_GPENCIL_SRC_TRACK = 1, + SC_GPENCIL_SRC_CLIP = 0, + SC_GPENCIL_SRC_TRACK = 1, } eSpaceClip_GPencil_Source; - /** \} */ /* -------------------------------------------------------------------- */ @@ -1570,13 +1558,13 @@ typedef enum eSpaceClip_GPencil_Source { # # typedef struct SpaceTopBar { - SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; - /* End 'SpaceLink' header. */ + SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ } SpaceTopBar; /** \} */ @@ -1590,13 +1578,13 @@ typedef struct SpaceTopBar { # # typedef struct SpaceStatusBar { - SpaceLink *next, *prev; - /** Storage of regions for inactive spaces. */ - ListBase regionbase; - char spacetype; - char link_flag; - char _pad0[6]; - /* End 'SpaceLink' header. */ + SpaceLink *next, *prev; + /** Storage of regions for inactive spaces. */ + ListBase regionbase; + char spacetype; + char link_flag; + char _pad0[6]; + /* End 'SpaceLink' header. */ } SpaceStatusBar; /** \} */ @@ -1608,34 +1596,34 @@ typedef struct SpaceStatusBar { /* space types, moved from DNA_screen_types.h */ /* Do NOT change order, append on end. types are hardcoded needed */ typedef enum eSpace_Type { - SPACE_EMPTY = 0, - SPACE_VIEW3D = 1, - SPACE_GRAPH = 2, - SPACE_OUTLINER = 3, - SPACE_PROPERTIES = 4, - SPACE_FILE = 5, - SPACE_IMAGE = 6, - SPACE_INFO = 7, - SPACE_SEQ = 8, - SPACE_TEXT = 9, + SPACE_EMPTY = 0, + SPACE_VIEW3D = 1, + SPACE_GRAPH = 2, + SPACE_OUTLINER = 3, + SPACE_PROPERTIES = 4, + SPACE_FILE = 5, + SPACE_IMAGE = 6, + SPACE_INFO = 7, + SPACE_SEQ = 8, + SPACE_TEXT = 9, #ifdef DNA_DEPRECATED - SPACE_IMASEL = 10, /* deprecated */ - SPACE_SOUND = 11, /* Deprecated */ + SPACE_IMASEL = 10, /* deprecated */ + SPACE_SOUND = 11, /* Deprecated */ #endif - SPACE_ACTION = 12, - SPACE_NLA = 13, - /* TODO: fully deprecate */ - SPACE_SCRIPT = 14, /* Deprecated */ - SPACE_TIME = 15, /* Deprecated */ - SPACE_NODE = 16, - SPACE_LOGIC = 17, /* deprecated */ - SPACE_CONSOLE = 18, - SPACE_USERPREF = 19, - SPACE_CLIP = 20, - SPACE_TOPBAR = 21, - SPACE_STATUSBAR = 22, - - SPACE_TYPE_LAST = SPACE_STATUSBAR, + SPACE_ACTION = 12, + SPACE_NLA = 13, + /* TODO: fully deprecate */ + SPACE_SCRIPT = 14, /* Deprecated */ + SPACE_TIME = 15, /* Deprecated */ + SPACE_NODE = 16, + SPACE_LOGIC = 17, /* deprecated */ + SPACE_CONSOLE = 18, + SPACE_USERPREF = 19, + SPACE_CLIP = 20, + SPACE_TOPBAR = 21, + SPACE_STATUSBAR = 22, + + SPACE_TYPE_LAST = SPACE_STATUSBAR, } eSpace_Type; /* use for function args */ @@ -1645,4 +1633,4 @@ typedef enum eSpace_Type { /** \} */ -#endif /* __DNA_SPACE_TYPES_H__ */ +#endif /* __DNA_SPACE_TYPES_H__ */ |