From a2c182e9233333fc3b8ff40d352113ec95e7e30c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 3 Mar 2012 16:31:46 +0000 Subject: style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide). --- source/blender/editors/include/BIF_glutil.h | 4 +- source/blender/editors/include/ED_armature.h | 38 +++++++++---------- source/blender/editors/include/ED_datafiles.h | 2 +- source/blender/editors/include/ED_mesh.h | 44 +++++++++++----------- source/blender/editors/include/ED_render.h | 12 +++--- source/blender/editors/include/ED_space_api.h | 2 +- source/blender/editors/include/UI_interface.h | 10 ++--- .../blender/editors/include/UI_interface_icons.h | 4 +- 8 files changed, 58 insertions(+), 58 deletions(-) (limited to 'source/blender/editors/include') diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h index 77c50f9ca6d..d0d50aa86fa 100644 --- a/source/blender/editors/include/BIF_glutil.h +++ b/source/blender/editors/include/BIF_glutil.h @@ -110,7 +110,7 @@ void glaRasterPosSafe2f (float x, float y, float known_good_x, float known_good * coordinates for would be clipped. The routine respects the * glPixelZoom values, pixel unpacking parameters are _not_ * respected. - + * * \attention This routine makes many assumptions: the rect data * is expected to be in RGBA unsigned byte format, the coordinate * (0.375, 0.375) is assumed to be within the view frustum, and the @@ -131,7 +131,7 @@ void glaDrawPixelsSafe (float x, float y, int img_w, int img_h, int row_w, int * cards, and also avoids problems with the raster position being * clipped when offscreen. The routine respects the glPixelZoom values, * pixel unpacking parameters are _not_ respected. - + * * \attention This routine makes many assumptions: the rect data * is expected to be in RGBA byte or float format, and the * modelview and projection matrices are assumed to define a diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index a073cdddae7..851bd09dd29 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -56,32 +56,32 @@ struct wmOperator; typedef struct EditBone { struct EditBone *next, *prev; - struct IDProperty *prop; /* User-Defined Properties on this Bone */ - struct EditBone *parent;/* Editbones have a one-way link (i.e. children refer - to parents. This is converted to a two-way link for - normal bones when leaving editmode. */ - void *temp; /* Used to store temporary data */ - - char name[64]; /* MAX_NAME */ - float roll; /* Roll along axis. We'll ultimately use the axis/angle method - for determining the transformation matrix of the bone. The axis - is tail-head while roll provides the angle. Refer to Graphics - Gems 1 p. 466 (section IX.6) if it's not already in here somewhere*/ - - float head[3]; /* Orientation and length is implicit during editing */ - float tail[3]; - /* All joints are considered to have zero rotation with respect to - their parents. Therefore any rotations specified during the - animation are automatically relative to the bones' rest positions*/ + struct IDProperty *prop;/* User-Defined Properties on this Bone */ + struct EditBone *parent;/* Editbones have a one-way link (i.e. children refer + * to parents. This is converted to a two-way link for + * normal bones when leaving editmode. */ + void *temp; /* Used to store temporary data */ + + char name[64]; /* MAX_NAME */ + float roll; /* Roll along axis. We'll ultimately use the axis/angle method + * for determining the transformation matrix of the bone. The axis + * is tail-head while roll provides the angle. Refer to Graphics + * Gems 1 p. 466 (section IX.6) if it's not already in here somewhere*/ + + float head[3]; /* Orientation and length is implicit during editing */ + float tail[3]; + /* All joints are considered to have zero rotation with respect to + * their parents. Therefore any rotations specified during the + * animation are automatically relative to the bones' rest positions*/ int flag; int layer; float dist, weight; - float xwidth, length, zwidth; /* put them in order! transform uses this as scale */ + float xwidth, length, zwidth; /* put them in order! transform uses this as scale */ float ease1, ease2; float rad_head, rad_tail; - float oldlength; /* for envelope scaling */ + float oldlength; /* for envelope scaling */ short segments; } EditBone; diff --git a/source/blender/editors/include/ED_datafiles.h b/source/blender/editors/include/ED_datafiles.h index 9fe2fe685a0..c725808ec34 100644 --- a/source/blender/editors/include/ED_datafiles.h +++ b/source/blender/editors/include/ED_datafiles.h @@ -56,7 +56,7 @@ extern char datatoc_bmonofont_ttf[]; /* Brush icon datafiles */ /* TODO: this could be simplified by putting all - the brush icons in one file */ + * the brush icons in one file */ extern int datatoc_add_png_size; extern char datatoc_add_png[]; diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h index 986c2abad69..c40048625a7 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.h @@ -96,30 +96,30 @@ int mesh_mirrtopo_table(struct Object *ob, char mode); /* bmeshutils.c */ -/* - [note: I've decided to use ideasman's code for non-editmode stuff, but since - it has a big "not for editmode!" disclaimer, I'm going to keep what I have here - - joeedh] - - x-mirror editing api. usage: - - EDBM_CacheMirrorVerts(em); - ... - ... - BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { - mirrorv = EDBM_GetMirrorVert(em, v); - } - ... - ... - EDBM_EndMirrorCache(em); - - note: why do we only allow x axis mirror editing? - */ +/** + * [note: I've decided to use ideasman's code for non-editmode stuff, but since + * it has a big "not for editmode!" disclaimer, I'm going to keep what I have here + * - joeedh] + * + * x-mirror editing api. usage: + * + * EDBM_CacheMirrorVerts(em); + * ... + * ... + * BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) { + * mirrorv = EDBM_GetMirrorVert(em, v); + * } + * ... + * ... + * EDBM_EndMirrorCache(em); + * + * \note why do we only allow x axis mirror editing? + */ void EDBM_CacheMirrorVerts(struct BMEditMesh *em, const short use_select); /* note, replaces EM_cache_x_mirror_vert in trunk */ -/*retrieves mirrored cache vert, or NULL if there isn't one. - note: calling this without ensuring the mirror cache state - is bad.*/ +/* retrieves mirrored cache vert, or NULL if there isn't one. + * note: calling this without ensuring the mirror cache state + * is bad.*/ struct BMVert *EDBM_GetMirrorVert(struct BMEditMesh *em, struct BMVert *v); void EDBM_ClearMirrorVert(struct BMEditMesh *em, struct BMVert *v); void EDBM_EndMirrorCache(struct BMEditMesh *em); diff --git a/source/blender/editors/include/ED_render.h b/source/blender/editors/include/ED_render.h index c9e00b0296a..73bbd5ffef8 100644 --- a/source/blender/editors/include/ED_render.h +++ b/source/blender/editors/include/ED_render.h @@ -67,12 +67,12 @@ typedef struct RenderInfo { #define PR_ROTATED 8 /* Render the preview - -pr_method: -- PR_BUTS_RENDER: preview is rendered for buttons window -- PR_ICON_RENDER: preview is rendered for icons. hopefully fast enough for at least 32x32 -- PR_NODE_RENDER: preview is rendered for node editor. -*/ + * + * pr_method: + * - PR_BUTS_RENDER: preview is rendered for buttons window + * - PR_ICON_RENDER: preview is rendered for icons. hopefully fast enough for at least 32x32 + * - PR_NODE_RENDER: preview is rendered for node editor + */ #define PR_BUTS_RENDER 0 #define PR_ICON_RENDER 1 diff --git a/source/blender/editors/include/ED_space_api.h b/source/blender/editors/include/ED_space_api.h index 0d6e640c7bf..8023eef8370 100644 --- a/source/blender/editors/include/ED_space_api.h +++ b/source/blender/editors/include/ED_space_api.h @@ -57,7 +57,7 @@ void ED_spacetype_userpref(void); void ED_spacetype_clip(void); /* calls for instancing and freeing spacetype static data - called in WM_init_exit */ + * called in WM_init_exit */ /* in space_file.c */ void ED_file_init(void); void ED_file_exit(void); diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index fafd35bf911..18e2af939fd 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -178,11 +178,11 @@ typedef struct uiLayout uiLayout; #define UI_DPI_ICON_SIZE ((float)16 * UI_DPI_ICON_FAC) /* Button types, bits stored in 1 value... and a short even! -- bits 0-4: bitnr (0-31) -- bits 5-7: pointer type -- bit 8: for 'bit' -- bit 9-15: button type (now 6 bits, 64 types) -*/ + * - bits 0-4: bitnr (0-31) + * - bits 5-7: pointer type + * - bit 8: for 'bit' + * - bit 9-15: button type (now 6 bits, 64 types) + * */ #define CHA 32 #define SHO 64 diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h index a1b42ac39c2..c2bc2cf6af1 100644 --- a/source/blender/editors/include/UI_interface_icons.h +++ b/source/blender/editors/include/UI_interface_icons.h @@ -54,8 +54,8 @@ typedef struct IconFile { #define PREVIEW_DEFAULT_HEIGHT 96 /* - Resizable Icons for Blender -*/ + * Resizable Icons for Blender + */ void UI_icons_init(int first_dyn_id); int UI_icon_get_width(int icon_id); int UI_icon_get_height(int icon_id); -- cgit v1.2.3