From ace5677ef0db996a4236073d1e1d6895fd5cf4bd Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 25 Nov 2019 00:55:11 +1100 Subject: Cleanup: spelling, repeated words --- source/blender/blenkernel/BKE_blender_version.h | 2 +- source/blender/blenkernel/intern/curveprofile.c | 8 +++++--- source/blender/blenkernel/intern/gpencil.c | 4 ++-- source/blender/blenkernel/intern/particle.c | 2 +- source/blender/blenkernel/intern/subdiv_deform.c | 3 +-- source/blender/blenkernel/intern/subdiv_mesh.c | 3 +-- source/blender/blenlib/intern/math_geom.c | 2 +- source/blender/blenloader/intern/versioning_cycles.c | 2 +- source/blender/bmesh/operators/bmo_subdivide_edgering.c | 2 +- source/blender/bmesh/tools/bmesh_bevel.c | 10 +++++----- source/blender/depsgraph/intern/depsgraph.cc | 2 +- source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc | 2 +- source/blender/editors/mesh/editmesh_select.c | 2 +- source/blender/editors/object/object_add.c | 2 +- source/blender/editors/screen/screen_ops.c | 3 +-- source/blender/editors/space_view3d/view3d_fly.c | 2 +- source/blender/editors/space_view3d/view3d_walk.c | 2 +- source/blender/editors/transform/transform_generics.c | 2 +- source/blender/gpu/GPU_vertex_format.h | 2 +- source/blender/makesdna/DNA_object_types.h | 2 +- source/blender/makesdna/DNA_windowmanager_types.h | 2 +- source/blender/makesrna/intern/rna_scene.c | 2 +- source/blender/nodes/intern/node_common.c | 2 +- 23 files changed, 32 insertions(+), 33 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index dfa1b311eb0..dd1fff9ce47 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -37,7 +37,7 @@ #define BLENDER_VERSION_CHAR /** alpha/beta/rc/release, docs use this. */ #define BLENDER_VERSION_CYCLE alpha -/** Optionally set to 1,2,... for example to to get alpha1 or rc2. */ +/** Optionally set to 1,2,... for example to get alpha1 or rc2. */ #define BLENDER_VERSION_CYCLE_NUMBER /** Defined in from blender.c */ diff --git a/source/blender/blenkernel/intern/curveprofile.c b/source/blender/blenkernel/intern/curveprofile.c index df877e78379..f07d29c0807 100644 --- a/source/blender/blenkernel/intern/curveprofile.c +++ b/source/blender/blenkernel/intern/curveprofile.c @@ -199,9 +199,11 @@ CurveProfilePoint *BKE_curveprofile_insert(CurveProfile *profile, float x, float return new_pt; } -/** Sets the handle type of the selected control points. - * \param type_*: Either HD_VECT or HD_AUTO. Handle types for the first and second handles. - * \note: Requires curveprofile_update call after. */ +/** + * Sets the handle type of the selected control points. + * \param type_1, type_2: Either HD_VECT or HD_AUTO. Handle types for the first and second handles. + * \note: Requires curveprofile_update call after. + */ void BKE_curveprofile_selected_handle_set(CurveProfile *profile, int type_1, int type_2) { for (int i = 0; i < profile->path_len; i++) { diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index 15532233a76..c51668ea68c 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -510,8 +510,8 @@ bGPDstroke *BKE_gpencil_add_stroke_existing_style( bGPDframe *gpf, bGPDstroke *existing, int mat_idx, int totpoints, short thickness) { bGPDstroke *gps = BKE_gpencil_add_stroke(gpf, mat_idx, totpoints, thickness); - /* Copy runtime color data so that strokes added in the modifier has the style. - * There are depsgrapgh reference pointers inside, + /* Copy run-time color data so that strokes added in the modifier has the style. + * There are depsgraph reference pointers inside, * change the copy function if interfere with future drawing implementation. */ memcpy(&gps->runtime, &existing->runtime, sizeof(bGPDstroke_Runtime)); return gps; diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 74fbfc318a8..096142b9889 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -2965,7 +2965,7 @@ void psys_cache_paths(ParticleSimulationData *sim, float cfra, const bool use_re /*--get the first data points--*/ init_particle_interpolation(sim->ob, sim->psys, pa, &pind); - /* hairmat is needed for for non-hair particle too so we get proper rotations */ + /* 'hairmat' is needed for non-hair particle too so we get proper rotations. */ psys_mat_hair_to_global(sim->ob, psmd->mesh_final, psys->part->from, pa, hairmat); copy_v3_v3(rotmat[0], hairmat[2]); copy_v3_v3(rotmat[1], hairmat[1]); diff --git a/source/blender/blenkernel/intern/subdiv_deform.c b/source/blender/blenkernel/intern/subdiv_deform.c index 9c7949e7bdb..a686c44bf13 100644 --- a/source/blender/blenkernel/intern/subdiv_deform.c +++ b/source/blender/blenkernel/intern/subdiv_deform.c @@ -193,8 +193,7 @@ void BKE_subdiv_deform_coarse_vertices(struct Subdiv *subdiv, { BKE_subdiv_stats_begin(&subdiv->stats, SUBDIV_STATS_SUBDIV_TO_MESH); /* Make sure evaluator is up to date with possible new topology, and that - * is is refined for the new positions of coarse vertices. - */ + * is refined for the new positions of coarse vertices. */ if (!BKE_subdiv_eval_update_from_mesh(subdiv, coarse_mesh, vertex_cos)) { /* This could happen in two situations: * - OpenSubdiv is disabled. diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c b/source/blender/blenkernel/intern/subdiv_mesh.c index a30dde6284b..6c9cd72363a 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.c +++ b/source/blender/blenkernel/intern/subdiv_mesh.c @@ -1164,8 +1164,7 @@ Mesh *BKE_subdiv_to_mesh(Subdiv *subdiv, { BKE_subdiv_stats_begin(&subdiv->stats, SUBDIV_STATS_SUBDIV_TO_MESH); /* Make sure evaluator is up to date with possible new topology, and that - * is is refined for the new positions of coarse vertices. - */ + * it is refined for the new positions of coarse vertices. */ if (!BKE_subdiv_eval_update_from_mesh(subdiv, coarse_mesh, NULL)) { /* This could happen in two situations: * - OpenSubdiv is disabled. diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 6d8193e7675..67ef4d57b4b 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -3070,7 +3070,7 @@ bool isect_ray_ray_epsilon_v3(const float ray_origin_a[3], cross_v3_v3v3(n, ray_direction_b, ray_direction_a); const float nlen = len_squared_v3(n); - /* `nlen` is the the square of the area formed by the two vectors. */ + /* `nlen` is the square of the area formed by the two vectors. */ if (UNLIKELY(nlen < epsilon)) { /* The lines are parallel. */ return false; diff --git a/source/blender/blenloader/intern/versioning_cycles.c b/source/blender/blenloader/intern/versioning_cycles.c index 5610222e85d..6d140d700dc 100644 --- a/source/blender/blenloader/intern/versioning_cycles.c +++ b/source/blender/blenloader/intern/versioning_cycles.c @@ -1135,7 +1135,7 @@ static void update_voronoi_node_coloring(bNodeTree *ntree) } /* Previously, the output euclidean distance was actually the squared - * euclidean distance. To fix this, we square the the output distance + * euclidean distance. To fix this, we square the output distance * socket if the distance metric is set to SHD_VORONOI_EUCLIDEAN. */ static void update_voronoi_node_square_distance(bNodeTree *ntree) diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.c b/source/blender/bmesh/operators/bmo_subdivide_edgering.c index cfbff105d70..a193275ef52 100644 --- a/source/blender/bmesh/operators/bmo_subdivide_edgering.c +++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.c @@ -203,7 +203,7 @@ finally: static GSet *bm_edgering_pair_calc(BMesh *bm, ListBase *eloops_rim) { /** - * Method for for finding pairs: + * Method for finding pairs: * * - first create (vert -> eloop) mapping. * - loop over all eloops. diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 949fecba94d..e2f098d72f3 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -4290,7 +4290,7 @@ static VMesh *adj_vmesh(BevelParams *bp, BevVert *bv) /* To place the center vertex: * 'negative_fullest' is the reflection of the original vertex across the boundverts' center. - * 'fullness' is the fraction of the way from the boundvert's centroid to to the original vertex + * 'fullness' is the fraction of the way from the boundvert's centroid to the original vertex * (if positive) or to negative_fullest (if negative). */ copy_v3_v3(original_vertex, bv->v->co); sub_v3_v3v3(negative_fullest, boundverts_center, original_vertex); @@ -4795,9 +4795,9 @@ static VMesh *square_out_adj_vmesh(BevelParams *bp, BevVert *bv) if (odd) { ang = 0.5f * angle_v3v3v3(bndv->nv.co, co1, bndv->next->nv.co); if (ang > BEVEL_SMALL_ANG) { - /* finalfrac is length along arms of isoceles triangle with top angle 2*ang + /* finalfrac is length along arms of isosceles triangle with top angle 2*ang * such that the base of the triangle is 1. - * This is used in interpolation along centerline in odd case. + * This is used in interpolation along center-line in odd case. * To avoid too big a drop from bv, cap finalfrac a 0.8 arbitrarily */ finalfrac = 0.5f / sinf(ang); if (finalfrac > 0.8f) { @@ -5506,7 +5506,7 @@ static void build_vmesh(BevelParams *bp, BMesh *bm, BevVert *bv) bndv = vm->boundstart; do { i = bndv->index; - /* bndv's last vert along the boundary arc is the the first of the next BoundVert's arc. */ + /* bndv's last vert along the boundary arc is the first of the next BoundVert's arc. */ copy_mesh_vert(vm, i, 0, ns, bndv->next->index, 0, 0); /* Fix the profile orientations if it's not a miter profile. */ @@ -6906,7 +6906,7 @@ static void find_even_superellipse_chords(int n, float r, double *xvals, double } /** Find the profile's "fullness," which is the fraction of the space it takes up way from the - * boundvert's centroid to to the original vertex for a non-custom profile, or in the case of a + * boundvert's centroid to the original vertex for a non-custom profile, or in the case of a * custom profile, the average "height" of the profile points along its centerline. */ static float find_profile_fullness(BevelParams *bp) { diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index 8f9595d2476..292c3b361d8 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -290,7 +290,7 @@ ID *Depsgraph::get_cow_id(const ID *id_orig) const * already a copy-on-write version or have a corresponding copy-on-write * version. * - * We try to enforce that in debug builds, for for release we play a bit + * We try to enforce that in debug builds, for release we play a bit * safer game here. */ if ((id_orig->tag & LIB_TAG_COPIED_ON_WRITE) == 0) { /* TODO(sergey): This is nice sanity check to have, but it fails diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index 73a0823f84b..8a33453b923 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -837,7 +837,7 @@ int foreach_libblock_validate_callback(void *user_data, if (*id_p != NULL) { if (!check_datablock_expanded(*id_p)) { data->is_valid = false; - /* TODO(sergey): Store which is is not valid? */ + /* TODO(sergey): Store which is not valid? */ } } return IDWALK_RET_NOP; diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c index 3e59a884696..7955ccc0977 100644 --- a/source/blender/editors/mesh/editmesh_select.c +++ b/source/blender/editors/mesh/editmesh_select.c @@ -2917,7 +2917,7 @@ bool EDBM_select_interior_faces(BMEditMesh *em) SWAP(int, i_a, i_b); } - /* Merge the the groups. */ + /* Merge the groups. */ LISTBASE_FOREACH (LinkData *, n, &fgroup_listbase[i_b]) { BMFace *f_iter = n->data; BM_elem_index_set(f_iter, i_a); diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index f27e525449d..5286637afe2 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -2735,7 +2735,7 @@ void OBJECT_OT_duplicate(wmOperatorType *ot) /* -------------------------------------------------------------------- */ /** \name Add Named Object Operator * - * Use for for drag & drop. + * Use for drag & drop. * \{ */ static int add_named_exec(bContext *C, wmOperator *op) diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index a5bb9f77052..9975c49dc54 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -4263,8 +4263,7 @@ static int match_region_with_redraws(int spacetype, break; case SPACE_ACTION: /* if only 1 window or 3d windows, we do timeline too - * NOTE: Now we do do action editor in all these cases, since timeline is here - */ + * NOTE: Now we do action editor in all these cases, since timeline is here. */ if ((redraws & (TIME_ALL_ANIM_WIN | TIME_REGION | TIME_ALL_3D_WIN)) || from_anim_edit) { return 1; } diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index dbbc7f2a32e..903d6231b22 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -146,7 +146,7 @@ typedef struct FlyInfo { struct Depsgraph *depsgraph; Scene *scene; - /** Needed for for updating that isn't triggered by input. */ + /** Needed for updating that isn't triggered by input. */ wmTimer *timer; short state; diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c index a7402a622d5..494e7529975 100644 --- a/source/blender/editors/space_view3d/view3d_walk.c +++ b/source/blender/editors/space_view3d/view3d_walk.c @@ -191,7 +191,7 @@ typedef struct WalkInfo { struct Depsgraph *depsgraph; Scene *scene; - /** Needed for for updating that isn't triggered by input. */ + /** Needed for updating that isn't triggered by input. */ wmTimer *timer; short state; diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 548944e2d74..43e241da313 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1677,7 +1677,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve ((prop = RNA_struct_find_property(op->ptr, "orient_matrix")) && RNA_property_is_set(op->ptr, prop)) && ((t->flag & T_MODAL) || - /* When using redo, don't use the the custom constraint matrix + /* When using redo, don't use the custom constraint matrix * if the user selects a different orientation. */ (RNA_enum_get(op->ptr, "orient_type") == RNA_enum_get(op->ptr, "orient_matrix_type")))) { RNA_property_float_get_array(op->ptr, prop, &t->spacemtx[0][0]); diff --git a/source/blender/gpu/GPU_vertex_format.h b/source/blender/gpu/GPU_vertex_format.h index 8c22e3e1104..b50665d0256 100644 --- a/source/blender/gpu/GPU_vertex_format.h +++ b/source/blender/gpu/GPU_vertex_format.h @@ -75,7 +75,7 @@ typedef struct GPUVertAttr { BLI_STATIC_ASSERT(GPU_VERT_ATTR_NAMES_BUF_LEN <= 256, "We use uchar as index inside the name buffer " - "so GPU_VERT_ATTR_NAMES_BUF_LEN needs to be be " + "so GPU_VERT_ATTR_NAMES_BUF_LEN needs to be " "smaller than GPUVertFormat->name_offset and " "GPUVertAttr->names maximum value"); diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 82a90dfe7a2..a1ea51ab573 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -609,7 +609,7 @@ enum { #define BA_TEMP_TAG (1 << 5) /** - * Even if this is is tagged for transform, this flag means it's being locked in place. + * Even if this is tagged for transform, this flag means it's being locked in place. * Use for #SCE_XFORM_SKIP_CHILDREN. */ #define BA_TRANSFORM_LOCKED_IN_PLACE (1 << 7) diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index 57c0a29382d..b1a797a35fe 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -530,7 +530,7 @@ enum { * * This difference can be important because previous settings may be used, * even with #PROP_SKIP_SAVE the repeat last operator will use the previous settings. - * Unlike #OP_IS_REPEAT the selection (and context generally) may be be different each time. + * Unlike #OP_IS_REPEAT the selection (and context generally) may be different each time. * See T60777 for an example of when this is needed. */ OP_IS_REPEAT_LAST = (1 << 1), diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 4d3de4ed6e6..2b47b1664d7 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2684,7 +2684,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) PropertyRNA *prop; /* the construction of this enum is quite special - everything is stored as bitflags, - * with 1st position only for for on/off (and exposed as boolean), while others are mutually + * with 1st position only for on/off (and exposed as boolean), while others are mutually * exclusive options but which will only have any effect when autokey is enabled */ static const EnumPropertyItem auto_key_items[] = { diff --git a/source/blender/nodes/intern/node_common.c b/source/blender/nodes/intern/node_common.c index 2b6a89d5e65..6b3e378c94e 100644 --- a/source/blender/nodes/intern/node_common.c +++ b/source/blender/nodes/intern/node_common.c @@ -271,7 +271,7 @@ static void node_reroute_inherit_type_recursive(bNodeTree *ntree, bNode *node, i const char *type_idname = nodeStaticSocketType(type, PROP_NONE); /* XXX it would be a little bit more efficient to restrict actual updates - * to rerout nodes connected to an updated node, but there's no reliable flag + * to reroute nodes connected to an updated node, but there's no reliable flag * to indicate updated nodes (node->update is not set on linking). */ -- cgit v1.2.3