From ec4e12d9a2f080aa7dfdd7375288f1804de1224d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 18 Mar 2014 02:40:39 +1100 Subject: [PATCH] Code cleanup: comments and typos --- source/blender/blenlib/intern/polyfill2d.c | 10 +++++----- source/blender/bmesh/intern/bmesh_opdefines.c | 2 +- source/blender/bmesh/intern/bmesh_walkers_impl.c | 2 +- source/blender/editors/animation/keyframing.c | 2 +- source/blender/editors/mesh/editmesh_knife.c | 4 ++-- source/blender/editors/screen/screen_ops.c | 2 +- source/blender/editors/space_view3d/view3d_walk.c | 2 +- source/blender/modifiers/intern/MOD_wireframe.c | 4 ++-- source/tests/bl_pyapi_mathutils.py | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/source/blender/blenlib/intern/polyfill2d.c b/source/blender/blenlib/intern/polyfill2d.c index 9168d2f3228..0b1b461ff73 100644 --- a/source/blender/blenlib/intern/polyfill2d.c +++ b/source/blender/blenlib/intern/polyfill2d.c @@ -368,11 +368,11 @@ static unsigned int pf_index_next(const PolyFill *pf, unsigned index) } /** -* Triangulates the given (convex or concave) simple polygon to a list of triangle vertices. -* \param vertices pairs describing vertices of the polygon, in either clockwise or counterclockwise order. -* \return triples of triangle indices in clockwise order. -* Note the returned array is reused for later calls to the same method. -*/ + * Triangulates the given (convex or concave) simple polygon to a list of triangle vertices. + * \param vertices pairs describing vertices of the polygon, in either clockwise or counterclockwise order. + * \return triples of triangle indices in clockwise order. + * Note the returned array is reused for later calls to the same method. + */ void BLI_polyfill_calc_ex( const float (*coords)[2], const unsigned int coords_tot, diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index fcd84ea2720..b50e08404b0 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -49,7 +49,7 @@ * for output slots, for single-type geometry slots, use the type name plus "out", * (e.g. verts.out), for double-type slots, use the two type names plus "out", * (e.g. vertfaces.out), for three-type slots, use geom. note that you can also - * use more esohteric names (e.g. geom_skirt.out) so long as the comment next to the + * use more esoteric names (e.g. geom_skirt.out) so long as the comment next to the * slot definition tells you what types of elements are in it. * */ diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index 357fe057380..ee0e35b1013 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -659,7 +659,7 @@ static void *bmw_LoopWalker_step(BMWalker *walker) (owalk.is_single == false && vert_edge_tot > 2) || /* initial edge was a boundary, so is this edge and vertex is only apart of this face - * this lets us walk over the the boundary of an ngon which is handy */ + * this lets us walk over the the boundary of an ngon which is handy */ (owalk.is_single == true && vert_edge_tot == 2 && BM_edge_is_boundary(e))) { /* find next boundary edge in the fan */ diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 7ee02666c61..8ffc3199f2b 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -761,7 +761,7 @@ static float visualkey_get_value(PointerRNA *ptr, PropertyRNA *prop, int array_i int rotmode; /* handle for Objects or PoseChannels only - * - only Location, Rotation or Scale keyframes are supported curently + * - only Location, Rotation or Scale keyframes are supported currently * - constraints can be on either Objects or PoseChannels, so we only check if the * ptr->type is RNA_Object or RNA_PoseBone, which are the RNA wrapping-info for * those structs, allowing us to identify the owner of the data diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 772fe7d306e..9087643290a 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -1389,8 +1389,8 @@ static void knife_find_line_hits(KnifeTool_OpData *kcd) if (!(d1 <= vert_tol || d2 <= vert_tol || fabsf(d1 - d2) <= vert_tol)) { lambda = d1 / d2; /* Can't just interpolate between ends of kfe because - * that doesn't work with perspective transformation. - * Need to find 3d intersection of ray through sint */ + * that doesn't work with perspective transformation. + * Need to find 3d intersection of ray through sint */ knife_input_ray_segment(kcd, sint, 1.0f, r1, r2); isect_kind = isect_line_line_v3(kfe->v1->cageco, kfe->v2->cageco, r1, r2, p, p2); if (isect_kind >= 1 && point_is_visible(kcd, p, sint, &mats)) { diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 2cb28ebba90..49f883ea6a4 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -3659,7 +3659,7 @@ static int scene_new_exec(bContext *C, wmOperator *op) else { /* different kinds of copying */ newscene = BKE_scene_copy(scene, type); - /* these can't be handled in blenkernel curently, so do them here */ + /* these can't be handled in blenkernel currently, so do them here */ if (type == SCE_COPY_LINK_DATA) { ED_object_single_users(bmain, newscene, false, true); } diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c index 7d387332174..5fa21640d1e 100644 --- a/source/blender/editors/space_view3d/view3d_walk.c +++ b/source/blender/editors/space_view3d/view3d_walk.c @@ -1095,7 +1095,7 @@ static int walkApply(bContext *C, WalkInfo *walk) } /* the distance we would fall naturally smoothly enough that we - can manually drop the object without activating gravity */ + * can manually drop the object without activating gravity */ fall_distance = time_redraw * walk->speed * WALK_BOOST_FACTOR; if (fabsf(difference) < fall_distance) { diff --git a/source/blender/modifiers/intern/MOD_wireframe.c b/source/blender/modifiers/intern/MOD_wireframe.c index 474a7550533..76986583ef5 100644 --- a/source/blender/modifiers/intern/MOD_wireframe.c +++ b/source/blender/modifiers/intern/MOD_wireframe.c @@ -20,8 +20,8 @@ */ /** \file blender/modifiers/intern/MOD_wireframe.c -* \ingroup modifiers -*/ + * \ingroup modifiers + */ #include "MEM_guardedalloc.h" diff --git a/source/tests/bl_pyapi_mathutils.py b/source/tests/bl_pyapi_mathutils.py index 45d68257559..c31244462cd 100644 --- a/source/tests/bl_pyapi_mathutils.py +++ b/source/tests/bl_pyapi_mathutils.py @@ -26,7 +26,7 @@ vector_data = ( # get data at different scales vector_data = sum( (tuple(tuple(a * scale for a in v) for v in vector_data) - for scale in (s * sign for s in (0.0001, 0.1, -1.0, 10.0, 1000.0, 100000.0) + for scale in (s * sign for s in (0.0001, 0.1, 1.0, 10.0, 1000.0, 100000.0) for sign in (1.0, -1.0))), ()) + ((0.0, 0.0, 0.0),)