diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-17 03:37:23 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-17 03:37:23 +0400 |
commit | 9dd981a44029b612f3925405d964c739dd537b5f (patch) | |
tree | d0f01cc43e505a3d04b515b82dd0e21c3f6c6c6f /source/blender/blenkernel | |
parent | 18a7efac14a2743a97c0f64412b5e6657e03113b (diff) |
style cleanup: block comments
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_ccg.h | 16 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_customdata.h | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 36 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/deform.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/depsgraph.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 16 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/multires.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 26 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 2 |
11 files changed, 58 insertions, 58 deletions
diff --git a/source/blender/blenkernel/BKE_ccg.h b/source/blender/blenkernel/BKE_ccg.h index 597d6498d99..6d39d42bde5 100644 --- a/source/blender/blenkernel/BKE_ccg.h +++ b/source/blender/blenkernel/BKE_ccg.h @@ -38,11 +38,11 @@ struct CCGSubSurf; /* Each CCGElem is CCGSubSurf's representation of a subdivided - vertex. All CCGElems in a particular CCGSubSurf have the same - layout, but the layout can vary from one CCGSubSurf to another. For - this reason, CCGElem is presented as an opaque pointer, and - elements should always be accompanied by a CCGKey, which provides - the necessary offsets to access components of a CCGElem. + * vertex. All CCGElems in a particular CCGSubSurf have the same + * layout, but the layout can vary from one CCGSubSurf to another. For + * this reason, CCGElem is presented as an opaque pointer, and + * elements should always be accompanied by a CCGKey, which provides + * the necessary offsets to access components of a CCGElem. */ typedef struct CCGElem CCGElem; @@ -50,7 +50,7 @@ typedef struct CCGKey { int level; /* number of bytes in each element (one float per layer, plus - three floats for normals if enabled) */ + * three floats for normals if enabled) */ int elem_size; /* number of elements along each side of grid */ @@ -61,11 +61,11 @@ typedef struct CCGKey { int grid_bytes; /* currently always the last three floats, unless normals are - disabled */ + * disabled */ int normal_offset; /* offset in bytes of mask value; only valid if 'has_mask' is - true */ + * true */ int mask_offset; int num_layers; diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index b39ea7cca02..bbe68db8bfe 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -261,8 +261,8 @@ void CustomData_bmesh_set(const struct CustomData *data, void *block, int type, void CustomData_bmesh_set_n(struct CustomData *data, void *block, int type, int n, void *source); -/*sets the data of the block at physical layer n. no real type checking - *is performed. +/* sets the data of the block at physical layer n. no real type checking + * is performed. */ void CustomData_bmesh_set_layer_n(struct CustomData *data, void *block, int n, void *source); diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c index abbd4bf64bc..6f768a147f7 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.c +++ b/source/blender/blenkernel/intern/CCGSubSurf.c @@ -3127,7 +3127,7 @@ void CCG_key(CCGKey *key, const CCGSubSurf *ss, int level) key->num_layers = ss->meshIFC.numLayers; /* if normals are present, always the last three floats of an - element */ + * element */ if (key->has_normals) key->normal_offset = key->elem_size - sizeof(float) * 3; else diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index 0e81b503cbf..b38f0f78cdb 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -92,7 +92,7 @@ static CM_SOLVER_DEF solvers [] = /* ********** cloth engine ******* */ /* Prototypes for internal functions. -*/ + */ static void cloth_to_object (Object *ob, ClothModifierData *clmd, float (*vertexCos)[3]); static void cloth_from_mesh ( ClothModifierData *clmd, DerivedMesh *dm ); static int cloth_from_object(Object *ob, ClothModifierData *clmd, DerivedMesh *dm, float framenr, int first); @@ -101,10 +101,10 @@ static void cloth_apply_vgroup ( ClothModifierData *clmd, DerivedMesh *dm ); /****************************************************************************** -* -* External interface called by modifier.c clothModifier functions. -* -******************************************************************************/ + * + * External interface called by modifier.c clothModifier functions. + * + ******************************************************************************/ /** * cloth_init - creates a new cloth simulation. * @@ -145,8 +145,8 @@ void cloth_init(ClothModifierData *clmd ) clmd->coll_parms->selfepsilon = 0.75; /* These defaults are copied from softbody.c's - * softbody_calc_forces() function. - */ + * softbody_calc_forces() function. + */ clmd->sim_parms->eff_force_scale = 1000.0; clmd->sim_parms->eff_wind_scale = 250.0; @@ -476,7 +476,7 @@ static DerivedMesh *cloth_to_triangles(DerivedMesh *dm) /************************************************ * clothModifier_do - main simulation function -************************************************/ + ************************************************/ void clothModifier_do(ClothModifierData *clmd, Scene *scene, Object *ob, DerivedMesh *dm, float (*vertexCos)[3]) { PointCache *cache; @@ -729,10 +729,10 @@ void cloth_free_modifier_extern(ClothModifierData *clmd ) } /****************************************************************************** -* -* Internal functions. -* -******************************************************************************/ + * + * Internal functions. + * + ******************************************************************************/ /** * cloth_to_object - copies the deformed vertices to the object. @@ -978,16 +978,16 @@ static void cloth_from_mesh ( ClothModifierData *clmd, DerivedMesh *dm ) memcpy ( &clmd->clothObject->mfaces[i], &mface[i], sizeof ( MFace ) ); /* Free the springs since they can't be correct if the vertices - * changed. - */ + * changed. + */ if ( clmd->clothObject->springs != NULL ) MEM_freeN ( clmd->clothObject->springs ); } /*************************************************************************************** -* SPRING NETWORK BUILDING IMPLEMENTATION BEGIN -***************************************************************************************/ + * SPRING NETWORK BUILDING IMPLEMENTATION BEGIN + ***************************************************************************************/ // be careful: implicit solver has to be resettet when using this one! // --> only for implicit handling of this spring! @@ -1276,6 +1276,6 @@ static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm ) } /* cloth_build_springs */ /*************************************************************************************** -* SPRING NETWORK BUILDING IMPLEMENTATION END -***************************************************************************************/ + * SPRING NETWORK BUILDING IMPLEMENTATION END + ***************************************************************************************/ diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 54bc4c742fb..6a0991cf4e5 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -2047,7 +2047,7 @@ static void make_bevel_list_3D_minimum_twist(BevList *bl) normalize_v3(vec_2); /* align the vector, can avoid this and it looks 98% OK but - * better to align the angle quat roll's before comparing */ + * better to align the angle quat roll's before comparing */ { cross_v3_v3v3(cross_tmp, bevp_last->dir, bevp_first->dir); angle = angle_normalized_v3v3(bevp_first->dir, bevp_last->dir); diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index 19e7eb9dce1..0396733760f 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -275,8 +275,8 @@ void defvert_flip_merged(MDeformVert *dvert, const int *flip_map, const int flip dw = &dvert->dw[i]; /* in case array got realloced */ /* distribute weights: if only one of the vertex groups was - * assigned this will halve the weights, otherwise it gets - * evened out. this keeps it proportional to other groups */ + * assigned this will halve the weights, otherwise it gets + * evened out. this keeps it proportional to other groups */ weight = 0.5f * (dw_cpy->weight + dw->weight); dw_cpy->weight = weight; dw->weight = weight; diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index 31d2ef9175b..edef2b1a662 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -1253,7 +1253,7 @@ DagNodeQueue *graph_dfs(void) int maxpos = 0; /* int is_cycle = 0; */ /* UNUSED */ /* - *fprintf(stderr, "starting DFS\n ------------\n"); + *fprintf(stderr, "starting DFS\n ------------\n"); */ nqueue = queue_create(DAGQUEUEALLOC); retqueue = queue_create(MainDag->numNodes); diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index bbd57a5478b..2a2451c4ac9 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -140,7 +140,7 @@ typedef struct VolumeGrid { int *s_pos; /* (x*y*z) t_index begin id */ int *s_num; /* (x*y*z) number of t_index points */ int *t_index; /* actual surface point index, - access: (s_pos+s_num) */ + * access: (s_pos+s_num) */ } VolumeGrid; typedef struct Vec3f { @@ -192,7 +192,7 @@ typedef struct PaintUVPoint { unsigned int v1, v2, v3; /* vertex indexes */ unsigned int neighbour_pixel; /* If this pixel isn't uv mapped to any face, - but it's neighboring pixel is */ + * but it's neighboring pixel is */ short quad; } PaintUVPoint; @@ -205,9 +205,9 @@ typedef struct ImgSeqFormatData { #define ADJ_ON_MESH_EDGE (1 << 0) typedef struct PaintAdjData { - int *n_target; /* array of neighboring point indexes, - for single sample use (n_index+neigh_num) */ - int *n_index; /* index to start reading n_target for each point */ + int *n_target; /* array of neighboring point indexes, + * for single sample use (n_index + neigh_num) */ + int *n_index; /* index to start reading n_target for each point */ int *n_num; /* num of neighs for each point */ int *flags; /* vertex adjacency flags */ int total_targets; /* size of n_target */ @@ -2540,8 +2540,8 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface) #if 0 /* ----------------------------------------------------------------- - * For debug, output pixel statuses to the color map - * -----------------------------------------------------------------*/ + * For debug, output pixel statuses to the color map + * -----------------------------------------------------------------*/ #pragma omp parallel for schedule(static) for (index = 0; index < sData->total_points; index++) { @@ -3293,7 +3293,7 @@ static int dynamicPaint_paintMesh(DynamicPaintSurface *surface, int f_index = hit.index; /* Also cast a ray in opposite direction to make sure - * point is at least surrounded by two brush faces */ + * point is at least surrounded by two brush faces */ negate_v3(ray_dir); hit.index = -1; hit.dist = 9999; diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index bd9972b62e6..4e8b67bd55b 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -600,7 +600,7 @@ static void multires_copy_dm_grid(CCGElem *gridA, CCGElem *gridB, CCGKey *keyA, } /* Reallocate gpm->data at a lower resolution and copy values over - from the original high-resolution data */ + * from the original high-resolution data */ static void multires_grid_paint_mask_downsample(GridPaintMask *gpm, int level) { if (level < gpm->level) { @@ -1092,7 +1092,7 @@ static void multiresModifier_disp_run(DerivedMesh *dm, Mesh *me, DerivedMesh *dm break; case CALC_DISPLACEMENTS: /* Calculate displacement between new and old - * grid points and convert to tangent space */ + * grid points and convert to tangent space */ sub_v3_v3v3(disp, co, sco); invert_m3(mat); mul_v3_m3v3(data, mat, disp); @@ -1481,7 +1481,7 @@ DerivedMesh *multires_make_derived_from_derived(DerivedMesh *dm, } /**** Old Multires code **** -***************************/ + ***************************/ /* Adapted from sculptmode.c */ void old_mdisps_bilinear(float out[3], float (*disps)[3], const int st, float u, float v) diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index a66b8a1a373..1041fb12305 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -3233,9 +3233,9 @@ static void springs_from_mesh(Object *ob) sb= ob->soft; if (me && sb) { /* using bp->origS as a container for spring calcualtions here - ** will be overwritten sbObjectStep() to receive - ** actual modifier stack positions - */ + * will be overwritten sbObjectStep() to receive + * actual modifier stack positions + */ if (me->totvert) { bp= ob->soft->bpoint; for (a=0; a<me->totvert; a++, bp++) { @@ -3283,10 +3283,10 @@ static void mesh_to_softbody(Scene *scene, Object *ob) for (a=0; a<me->totvert; a++, bp++) { /* get scalar values needed *per vertex* from vertex group functions, - so we can *paint* them nicly .. - they are normalized [0.0..1.0] so may be we need amplitude for scale - which can be done by caller but still .. i'd like it to go this way - */ + * so we can *paint* them nicly .. + * they are normalized [0.0..1.0] so may be we need amplitude for scale + * which can be done by caller but still .. i'd like it to go this way + */ if ((ob->softflag & OB_SB_GOAL) && sb->vertgroup) { /* even this is a deprecated evil hack */ /* I'd like to have it .. if (sb->namedVG_Goal[0]) */ @@ -3306,8 +3306,8 @@ static void mesh_to_softbody(Scene *scene, Object *ob) } /* to proove the concept - this enables per vertex *mass painting* - */ + * this enables per vertex *mass painting* + */ if (sb->namedVG_Mass[0]) { int grp= defgroup_name_index (ob, sb->namedVG_Mass); @@ -3411,9 +3411,9 @@ static void reference_to_scratch(Object *ob) } /* -helper function to get proper spring length -when object is rescaled -*/ + * helper function to get proper spring length + * when object is rescaled + */ static float globallen(float *v1, float *v2, Object *ob) { float p1[3], p2[3]; @@ -3793,7 +3793,7 @@ static void softbody_update_positions(Object *ob, SoftBody *sb, float (*vertexCo /* vertexCos came from local world, go global */ mul_m4_v3(ob->obmat, bp->origE); /* just to be save give bp->origT a defined value - will be calulated in interpolate_exciter()*/ + * will be calulated in interpolate_exciter()*/ copy_v3_v3(bp->origT, bp->origE); } } diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 2a92992cb9f..19edcf6ac64 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -1045,7 +1045,7 @@ void subsurf_copy_grid_hidden(DerivedMesh *dm, const MPoly *mpoly, } /* Translate GridPaintMask into vertex paint masks. Assumes vertices - are in the order output by ccgDM_copyFinalVertArray. */ + * are in the order output by ccgDM_copyFinalVertArray. */ void subsurf_copy_grid_paint_mask(DerivedMesh *dm, const MPoly *mpoly, float *paint_mask, const GridPaintMask *grid_paint_mask) |