From 5a43406e1bad973a8cb32702b4fdb588068a6dcd Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 7 Jan 2019 22:19:13 +1100 Subject: Cleanup: move DNA comments before struct members Needed for clang-format in some cases, see: T53211 --- source/blender/makesdna/DNA_mesh_types.h | 36 +++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 12 deletions(-) (limited to 'source/blender/makesdna/DNA_mesh_types.h') diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 9a91d3a0998..d0c41042d58 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -115,11 +115,13 @@ typedef struct Mesh_Runtime { typedef struct Mesh { ID id; - struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ + /** Animation data (must be immediately after id for utilities to use it). */ + struct AnimData *adt; struct BoundBox *bb; - struct Ipo *ipo DNA_DEPRECATED; /* old animation system, deprecated for 2.5 */ + /** Old animation system, deprecated for 2.5. */ + struct Ipo *ipo DNA_DEPRECATED; struct Key *key; struct Material **mat; struct MSelect *mselect; @@ -134,12 +136,18 @@ typedef struct Mesh { /* mface stores the tessellation (triangulation) of the mesh, * real faces are now stored in nface.*/ - struct MFace *mface; /* array of mesh object mode faces for tessellation */ - struct MTFace *mtface; /* store tessellation face UV's and texture here */ - struct TFace *tface DNA_DEPRECATED; /* deprecated, use mtface */ - struct MVert *mvert; /* array of verts */ - struct MEdge *medge; /* array of edges */ - struct MDeformVert *dvert; /* deformgroup vertices */ + /** Array of mesh object mode faces for tessellation. */ + struct MFace *mface; + /** Store tessellation face UV's and texture here. */ + struct MTFace *mtface; + /** Deprecated, use mtface. */ + struct TFace *tface DNA_DEPRECATED; + /** Array of verts. */ + struct MVert *mvert; + /** Array of edges. */ + struct MEdge *medge; + /** Deformgroup vertices. */ + struct MDeformVert *dvert; /* array of colors for the tessellated faces, must be number of tessellated * faces * 4 in length */ @@ -147,7 +155,8 @@ typedef struct Mesh { struct Mesh *texcomesh; /* When the object is available, the preferred access method is: BKE_editmesh_from_object(ob) */ - struct BMEditMesh *edit_btmesh; /* not saved in file! */ + /** Not saved in file!. */ + struct BMEditMesh *edit_btmesh; struct CustomData vdata, edata, fdata; @@ -179,12 +188,14 @@ typedef struct Mesh { char cd_flag, pad; char subdiv DNA_DEPRECATED, subdivr DNA_DEPRECATED; - char subsurftype DNA_DEPRECATED; /* only kept for backwards compat, not used anymore */ + /** Only kept for backwards compat, not used anymore. */ + char subsurftype DNA_DEPRECATED; char editflag; short totcol; - struct Multires *mr DNA_DEPRECATED; /* deprecated multiresolution modeling data, only keep for loading old files */ + /** Deprecated multiresolution modeling data, only keep for loading old files. */ + struct Multires *mr DNA_DEPRECATED; Mesh_Runtime runtime; } Mesh; @@ -192,7 +203,8 @@ typedef struct Mesh { /* deprecated by MTFace, only here for file reading */ #ifdef DNA_DEPRECATED typedef struct TFace { - void *tpage; /* the faces image for the active UVLayer */ + /** The faces image for the active UVLayer. */ + void *tpage; float uv[4][2]; unsigned int col[4]; char flag, transp; -- cgit v1.2.3