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_meta_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_meta_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_meta_types.h | 166 |
1 files changed, 82 insertions, 84 deletions
diff --git a/source/blender/makesdna/DNA_meta_types.h b/source/blender/makesdna/DNA_meta_types.h index 92b6c6e3c5b..c98842eb6d7 100644 --- a/source/blender/makesdna/DNA_meta_types.h +++ b/source/blender/makesdna/DNA_meta_types.h @@ -33,107 +33,105 @@ struct BoundBox; struct Ipo; struct Material; - typedef struct MetaElem { - struct MetaElem *next, *prev; - - /** Bound Box of MetaElem. */ - struct BoundBox *bb; - - short type, flag; - char _pad[4]; - /** Position of center of MetaElem. */ - float x, y, z; - /** Rotation of MetaElem (MUST be kept normalized). */ - float quat[4]; - /** Dimension parameters, used for some types like cubes. */ - float expx; - float expy; - float expz; - /** Radius of the meta element. */ - float rad; - /** Temp field, used only while processing. */ - float rad2; - /** Stiffness, how much of the element to fill. */ - float s; - /** Old, only used for backwards compat. use dimensions now. */ - float len; - - /** Matrix and inverted matrix. */ - float *mat, *imat; + struct MetaElem *next, *prev; + + /** Bound Box of MetaElem. */ + struct BoundBox *bb; + + short type, flag; + char _pad[4]; + /** Position of center of MetaElem. */ + float x, y, z; + /** Rotation of MetaElem (MUST be kept normalized). */ + float quat[4]; + /** Dimension parameters, used for some types like cubes. */ + float expx; + float expy; + float expz; + /** Radius of the meta element. */ + float rad; + /** Temp field, used only while processing. */ + float rad2; + /** Stiffness, how much of the element to fill. */ + float s; + /** Old, only used for backwards compat. use dimensions now. */ + float len; + + /** Matrix and inverted matrix. */ + float *mat, *imat; } MetaElem; typedef struct MetaBall { - ID id; - struct AnimData *adt; - - ListBase elems; - ListBase disp; - /** Not saved in files, note we use pointer for editmode check. */ - ListBase *editelems; - /** Old animation system, deprecated for 2.5. */ - struct Ipo *ipo DNA_DEPRECATED; - - /* material of the mother ball will define the material used of all others */ - struct Material **mat; - - /** Flag is enum for updates, flag2 is bitflags for settings. */ - char flag, flag2; - short totcol; - /** Used to store MB_AUTOSPACE. */ - short texflag; - char _pad[2]; - - /* texture space, copied as one block in editobject.c */ - float loc[3]; - float size[3]; - float rot[3]; - - /** Display and render res. */ - float wiresize, rendersize; - - /* bias elements to have an offset volume. - * mother ball changes will effect other objects thresholds, - * but these may also have their own thresh as an offset */ - float thresh; - - /* used in editmode */ - /*ListBase edit_elems;*/ - MetaElem *lastelem; - - void *batch_cache; + ID id; + struct AnimData *adt; + + ListBase elems; + ListBase disp; + /** Not saved in files, note we use pointer for editmode check. */ + ListBase *editelems; + /** Old animation system, deprecated for 2.5. */ + struct Ipo *ipo DNA_DEPRECATED; + + /* material of the mother ball will define the material used of all others */ + struct Material **mat; + + /** Flag is enum for updates, flag2 is bitflags for settings. */ + char flag, flag2; + short totcol; + /** Used to store MB_AUTOSPACE. */ + short texflag; + char _pad[2]; + + /* texture space, copied as one block in editobject.c */ + float loc[3]; + float size[3]; + float rot[3]; + + /** Display and render res. */ + float wiresize, rendersize; + + /* bias elements to have an offset volume. + * mother ball changes will effect other objects thresholds, + * but these may also have their own thresh as an offset */ + float thresh; + + /* used in editmode */ + /*ListBase edit_elems;*/ + MetaElem *lastelem; + + void *batch_cache; } MetaBall; /* **************** METABALL ********************* */ /* texflag */ -#define MB_AUTOSPACE 1 +#define MB_AUTOSPACE 1 /* mb->flag */ -#define MB_UPDATE_ALWAYS 0 -#define MB_UPDATE_HALFRES 1 -#define MB_UPDATE_FAST 2 -#define MB_UPDATE_NEVER 3 +#define MB_UPDATE_ALWAYS 0 +#define MB_UPDATE_HALFRES 1 +#define MB_UPDATE_FAST 2 +#define MB_UPDATE_NEVER 3 /* mb->flag2 */ -#define MB_DS_EXPAND (1 << 0) - +#define MB_DS_EXPAND (1 << 0) /* ml->type */ -#define MB_BALL 0 -#define MB_TUBEX 1 /* depercated */ -#define MB_TUBEY 2 /* depercated */ -#define MB_TUBEZ 3 /* depercated */ -#define MB_TUBE 4 -#define MB_PLANE 5 -#define MB_ELIPSOID 6 -#define MB_CUBE 7 +#define MB_BALL 0 +#define MB_TUBEX 1 /* depercated */ +#define MB_TUBEY 2 /* depercated */ +#define MB_TUBEZ 3 /* depercated */ +#define MB_TUBE 4 +#define MB_PLANE 5 +#define MB_ELIPSOID 6 +#define MB_CUBE 7 -#define MB_TYPE_SIZE_SQUARED(type) (type == MB_ELIPSOID) +#define MB_TYPE_SIZE_SQUARED(type) (type == MB_ELIPSOID) /* ml->flag */ -#define MB_NEGATIVE 2 -#define MB_HIDE 8 -#define MB_SCALE_RAD 16 +#define MB_NEGATIVE 2 +#define MB_HIDE 8 +#define MB_SCALE_RAD 16 #endif |