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_outliner_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_outliner_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_outliner_types.h | 144 |
1 files changed, 76 insertions, 68 deletions
diff --git a/source/blender/makesdna/DNA_outliner_types.h b/source/blender/makesdna/DNA_outliner_types.h index bbd3cf62c2d..1462d955f81 100644 --- a/source/blender/makesdna/DNA_outliner_types.h +++ b/source/blender/makesdna/DNA_outliner_types.h @@ -29,92 +29,100 @@ struct ID; typedef struct TreeStoreElem { - short type, nr, flag, used; + short type, nr, flag, used; - /* XXX We actually also store non-ID data in this pointer for identifying - * the TreeStoreElem for a TreeElement when rebuilding the tree. Ugly! */ - struct ID *id; + /* XXX We actually also store non-ID data in this pointer for identifying + * the TreeStoreElem for a TreeElement when rebuilding the tree. Ugly! */ + struct ID *id; } TreeStoreElem; /* used only to store data in in blend files */ typedef struct TreeStore { - /** Was previously used for memory preallocation. */ - int totelem DNA_DEPRECATED; - /** Number of elements in data array. */ - int usedelem; - /** - * Elements to be packed from mempool in writefile.c - * or extracted to mempool in readfile.c - */ - TreeStoreElem *data; + /** Was previously used for memory preallocation. */ + int totelem DNA_DEPRECATED; + /** Number of elements in data array. */ + int usedelem; + /** + * Elements to be packed from mempool in writefile.c + * or extracted to mempool in readfile.c + */ + TreeStoreElem *data; } TreeStore; /* TreeStoreElem->flag */ enum { - TSE_CLOSED = (1 << 0), - TSE_SELECTED = (1 << 1), - TSE_TEXTBUT = (1 << 2), - TSE_CHILDSEARCH = (1 << 3), - TSE_SEARCHMATCH = (1 << 4), - TSE_HIGHLIGHTED = (1 << 5), - TSE_DRAG_INTO = (1 << 6), - TSE_DRAG_BEFORE = (1 << 7), - TSE_DRAG_AFTER = (1 << 8), - TSE_DRAG_ANY = (TSE_DRAG_INTO | TSE_DRAG_BEFORE | TSE_DRAG_AFTER), + TSE_CLOSED = (1 << 0), + TSE_SELECTED = (1 << 1), + TSE_TEXTBUT = (1 << 2), + TSE_CHILDSEARCH = (1 << 3), + TSE_SEARCHMATCH = (1 << 4), + TSE_HIGHLIGHTED = (1 << 5), + TSE_DRAG_INTO = (1 << 6), + TSE_DRAG_BEFORE = (1 << 7), + TSE_DRAG_AFTER = (1 << 8), + TSE_DRAG_ANY = (TSE_DRAG_INTO | TSE_DRAG_BEFORE | TSE_DRAG_AFTER), }; /* TreeStoreElem->types */ -#define TSE_NLA 1 /* NO ID */ -#define TSE_NLA_ACTION 2 -#define TSE_DEFGROUP_BASE 3 -#define TSE_DEFGROUP 4 -#define TSE_BONE 5 -#define TSE_EBONE 6 +#define TSE_NLA 1 /* NO ID */ +#define TSE_NLA_ACTION 2 +#define TSE_DEFGROUP_BASE 3 +#define TSE_DEFGROUP 4 +#define TSE_BONE 5 +#define TSE_EBONE 6 #define TSE_CONSTRAINT_BASE 7 -#define TSE_CONSTRAINT 8 -#define TSE_MODIFIER_BASE 9 -#define TSE_MODIFIER 10 -#define TSE_LINKED_OB 11 -/* #define TSE_SCRIPT_BASE 12 */ /* UNUSED */ -#define TSE_POSE_BASE 13 -#define TSE_POSE_CHANNEL 14 -#define TSE_ANIM_DATA 15 -#define TSE_DRIVER_BASE 16 /* NO ID */ -/* #define TSE_DRIVER 17 */ /* UNUSED */ +#define TSE_CONSTRAINT 8 +#define TSE_MODIFIER_BASE 9 +#define TSE_MODIFIER 10 +#define TSE_LINKED_OB 11 +/* #define TSE_SCRIPT_BASE 12 */ /* UNUSED */ +#define TSE_POSE_BASE 13 +#define TSE_POSE_CHANNEL 14 +#define TSE_ANIM_DATA 15 +#define TSE_DRIVER_BASE 16 /* NO ID */ +/* #define TSE_DRIVER 17 */ /* UNUSED */ -#define TSE_PROXY 18 -#define TSE_R_LAYER_BASE 19 -#define TSE_R_LAYER 20 -/* #define TSE_R_PASS 21 */ /* UNUSED */ -#define TSE_LINKED_MAT 22 +#define TSE_PROXY 18 +#define TSE_R_LAYER_BASE 19 +#define TSE_R_LAYER 20 +/* #define TSE_R_PASS 21 */ /* UNUSED */ +#define TSE_LINKED_MAT 22 /* NOTE, is used for light group */ -#define TSE_LINKED_LAMP 23 -#define TSE_POSEGRP_BASE 24 -#define TSE_POSEGRP 25 -#define TSE_SEQUENCE 26 /* NO ID */ -#define TSE_SEQ_STRIP 27 /* NO ID */ -#define TSE_SEQUENCE_DUP 28 /* NO ID */ -#define TSE_LINKED_PSYS 29 -#define TSE_RNA_STRUCT 30 /* NO ID */ -#define TSE_RNA_PROPERTY 31 /* NO ID */ -#define TSE_RNA_ARRAY_ELEM 32 /* NO ID */ -#define TSE_NLA_TRACK 33 /* NO ID */ -#define TSE_KEYMAP 34 /* NO ID */ -#define TSE_KEYMAP_ITEM 35 /* NO ID */ -#define TSE_ID_BASE 36 /* NO ID */ -#define TSE_GP_LAYER 37 /* NO ID */ -#define TSE_LAYER_COLLECTION 38 +#define TSE_LINKED_LAMP 23 +#define TSE_POSEGRP_BASE 24 +#define TSE_POSEGRP 25 +#define TSE_SEQUENCE 26 /* NO ID */ +#define TSE_SEQ_STRIP 27 /* NO ID */ +#define TSE_SEQUENCE_DUP 28 /* NO ID */ +#define TSE_LINKED_PSYS 29 +#define TSE_RNA_STRUCT 30 /* NO ID */ +#define TSE_RNA_PROPERTY 31 /* NO ID */ +#define TSE_RNA_ARRAY_ELEM 32 /* NO ID */ +#define TSE_NLA_TRACK 33 /* NO ID */ +#define TSE_KEYMAP 34 /* NO ID */ +#define TSE_KEYMAP_ITEM 35 /* NO ID */ +#define TSE_ID_BASE 36 /* NO ID */ +#define TSE_GP_LAYER 37 /* NO ID */ +#define TSE_LAYER_COLLECTION 38 #define TSE_SCENE_COLLECTION_BASE 39 -#define TSE_VIEW_COLLECTION_BASE 40 -#define TSE_SCENE_OBJECTS_BASE 41 - +#define TSE_VIEW_COLLECTION_BASE 40 +#define TSE_SCENE_OBJECTS_BASE 41 /* Check whether given TreeStoreElem should have a real ID in its ->id member. */ #define TSE_IS_REAL_ID(_tse) \ - (!ELEM((_tse)->type, TSE_NLA, TSE_NLA_TRACK, TSE_DRIVER_BASE, \ - TSE_SEQUENCE, TSE_SEQ_STRIP, TSE_SEQUENCE_DUP, \ - TSE_RNA_STRUCT, TSE_RNA_PROPERTY, TSE_RNA_ARRAY_ELEM, \ - TSE_KEYMAP, TSE_KEYMAP_ITEM, TSE_ID_BASE, TSE_GP_LAYER)) - + (!ELEM((_tse)->type, \ + TSE_NLA, \ + TSE_NLA_TRACK, \ + TSE_DRIVER_BASE, \ + TSE_SEQUENCE, \ + TSE_SEQ_STRIP, \ + TSE_SEQUENCE_DUP, \ + TSE_RNA_STRUCT, \ + TSE_RNA_PROPERTY, \ + TSE_RNA_ARRAY_ELEM, \ + TSE_KEYMAP, \ + TSE_KEYMAP_ITEM, \ + TSE_ID_BASE, \ + TSE_GP_LAYER)) #endif |