diff options
-rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/curve.cc | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/gpencil_geom.cc | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/bitmap_draw_2d.c | 2 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_250.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_delete.c | 4 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_smooth_laplacian.c | 2 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_armature.c | 2 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 4 | ||||
-rw-r--r-- | source/blender/editors/physics/physics_intern.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_brush.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_explode.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_laplaciansmooth.c | 6 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgmix.c | 2 | ||||
-rw-r--r-- | source/blender/simulation/intern/SIM_mass_spring.cpp | 2 |
16 files changed, 22 insertions, 22 deletions
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 21d60bcc5c5..b622d7ba85c 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -226,7 +226,7 @@ typedef struct ParticleCollision { } ParticleCollision; typedef struct ParticleDrawData { - float *vdata, *vd; /* vertice data */ + float *vdata, *vd; /* vertex data */ float *ndata, *nd; /* normal data */ float *cdata, *cd; /* color data */ float *vedata, *ved; /* velocity data */ diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index 103de672248..f7454a02de6 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -1825,7 +1825,7 @@ static bool cloth_build_springs(ClothModifierData *clmd, Mesh *mesh) else { /* bending springs for hair strands * The current algorithm only goes through the edges in order of the mesh edges list - * and makes springs between the outer vert of edges sharing a vertice. This works just + * and makes springs between the outer vert of edges sharing a vertex. This works just * fine for hair, but not for user generated string meshes. This could/should be later * extended to work with non-ordered edges so that it can be used for general "rope * dynamics" without the need for the vertices or edges to be ordered through the length diff --git a/source/blender/blenkernel/intern/curve.cc b/source/blender/blenkernel/intern/curve.cc index 6be04b79761..6b7f7af44e8 100644 --- a/source/blender/blenkernel/intern/curve.cc +++ b/source/blender/blenkernel/intern/curve.cc @@ -4843,7 +4843,7 @@ bool BKE_nurb_type_convert(Nurb *nu, while (a--) { if ((type == CU_POLY && bezt->h1 == HD_VECT && bezt->h2 == HD_VECT) || (use_handles == false)) { - /* vector handle becomes 1 poly vertice */ + /* vector handle becomes one poly vertex */ copy_v3_v3(bp->vec, bezt->vec[1]); bp->vec[3] = 1.0; bp->f1 = bezt->f2; diff --git a/source/blender/blenkernel/intern/gpencil_geom.cc b/source/blender/blenkernel/intern/gpencil_geom.cc index 865bcebee25..2160d567db5 100644 --- a/source/blender/blenkernel/intern/gpencil_geom.cc +++ b/source/blender/blenkernel/intern/gpencil_geom.cc @@ -2340,7 +2340,7 @@ static int gpencil_walk_edge(GHash *v_table, gped_init = &gp_edges[edge]; idx++; - /* Avoid to follow already visited vertice. */ + /* Avoid following already visited vertices. */ if (reverse) { if (BLI_ghash_haskey(v_table, POINTER_FROM_INT(gped->v1))) { edge = -1; diff --git a/source/blender/blenlib/intern/bitmap_draw_2d.c b/source/blender/blenlib/intern/bitmap_draw_2d.c index 7e7ad0346a8..16335933f67 100644 --- a/source/blender/blenlib/intern/bitmap_draw_2d.c +++ b/source/blender/blenlib/intern/bitmap_draw_2d.c @@ -208,7 +208,7 @@ void BLI_bitmap_draw_2d_tri_v2i( void (*callback)(int x, int x_end, int y, void *), void *user_data) { - /* At first sort the three vertices by y-coordinate ascending so p1 is the top-most vertice */ + /* At first sort the three vertices by y-coordinate ascending so p1 is the top-most vertex */ ORDER_VARS3_BY(const int *, p1, p2, p3, [1]); BLI_assert(p1[1] <= p2[1] && p2[1] <= p3[1]); diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c index ac59e3efc72..67b6ad25d8b 100644 --- a/source/blender/blenloader/intern/versioning_250.c +++ b/source/blender/blenloader/intern/versioning_250.c @@ -1723,7 +1723,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain) brush->crease_pinch_factor = 0.5f; } - /* will sculpt no vertexes */ + /* will sculpt no vertices */ if (brush->plane_trim == 0) { brush->plane_trim = 0.5f; } diff --git a/source/blender/bmesh/intern/bmesh_delete.c b/source/blender/bmesh/intern/bmesh_delete.c index 15f340def44..e2436e53099 100644 --- a/source/blender/bmesh/intern/bmesh_delete.c +++ b/source/blender/bmesh/intern/bmesh_delete.c @@ -173,7 +173,7 @@ void BMO_mesh_delete_oflag_context(BMesh *bm, const short oflag, const int type) bmo_remove_tagged_faces(bm, oflag); /* delete marked edge */ bmo_remove_tagged_edges(bm, oflag); - /* remove loose vertice */ + /* remove loose vertices */ bmo_remove_tagged_verts(bm, oflag); break; @@ -335,7 +335,7 @@ void BM_mesh_delete_hflag_context(BMesh *bm, const char hflag, const int type) bm_remove_tagged_faces(bm, hflag); /* delete marked edge */ bm_remove_tagged_edges(bm, hflag); - /* remove loose vertice */ + /* remove loose vertices */ bm_remove_tagged_verts(bm, hflag); break; diff --git a/source/blender/bmesh/operators/bmo_smooth_laplacian.c b/source/blender/bmesh/operators/bmo_smooth_laplacian.c index 704c2b267de..67ab57fa403 100644 --- a/source/blender/bmesh/operators/bmo_smooth_laplacian.c +++ b/source/blender/bmesh/operators/bmo_smooth_laplacian.c @@ -135,7 +135,7 @@ static LaplacianSystem *init_laplacian_system(int a_numEdges, int a_numLoops, in } /** - * Compute weight between vertice v_i and all your neighbors + * Compute weight between vertex v_i and all your neighbors * weight between v_i and v_neighbor * <pre> * Wij = cot(alpha) + cot(beta) / (4.0 * total area of all faces * sum all weight) diff --git a/source/blender/editors/gpencil/gpencil_armature.c b/source/blender/editors/gpencil/gpencil_armature.c index 39bfc287b43..d389f7eb5dd 100644 --- a/source/blender/editors/gpencil/gpencil_armature.c +++ b/source/blender/editors/gpencil/gpencil_armature.c @@ -453,7 +453,7 @@ static void gpencil_object_vgroup_calc_from_armature(const bContext *C, if (mode == GP_ARMATURE_AUTO) { /* Traverse the bone list, trying to fill vertex groups - * with the corresponding vertice weights for which the + * with the corresponding vertex weights for which the * bone is closest. */ gpencil_add_verts_to_dgroups(C, ob, ob_arm, ratio, decay); diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 5409cea2a2a..4862545e917 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -3325,7 +3325,7 @@ static void gpencil_brush_angle_segment(tGPsdata *p, tGPspoint *pt_prev, tGPspoi CLAMP(pt->pressure, GPENCIL_ALPHA_OPACITY_THRESH, 1.0f); } -/* Add arc points between two mouse events using the previous segment to determine the vertice of +/* Add arc points between two mouse events using the previous segment to determine the vertex of * the arc. * /+ CTL * / | @@ -3335,7 +3335,7 @@ static void gpencil_brush_angle_segment(tGPsdata *p, tGPspoint *pt_prev, tGPspoi * / * + PtA - 1 * / - * CTL is the vertice of the triangle created between PtA and PtB */ + * CTL is the vertex of the triangle created between PtA and PtB */ static void gpencil_add_arc_points(tGPsdata *p, const float mval[2], int segments) { bGPdata *gpd = p->gpd; diff --git a/source/blender/editors/physics/physics_intern.h b/source/blender/editors/physics/physics_intern.h index 49b25742163..da0b293e908 100644 --- a/source/blender/editors/physics/physics_intern.h +++ b/source/blender/editors/physics/physics_intern.h @@ -58,7 +58,7 @@ void PE_create_particle_edit(struct Depsgraph *depsgraph, */ void recalc_lengths(struct PTCacheEdit *edit); /** - * Calculate a tree for finding nearest emitter's vertice. + * Calculate a tree for finding nearest emitter's vertices. */ void recalc_emitter_field(struct Depsgraph *depsgraph, struct Object *ob, diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 4ffb3ffbe53..e282b474d8d 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -2705,7 +2705,7 @@ static void rna_def_brush(BlenderRNA *brna) RNA_def_property_float_default(prop, 0); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text( - prop, "Normal Weight", "How much grab will pull vertexes out of surface during a grab"); + prop, "Normal Weight", "How much grab will pull vertices out of surface during a grab"); RNA_def_property_update(prop, 0, "rna_Brush_update"); prop = RNA_def_property(srna, "elastic_deform_volume_preservation", PROP_FLOAT, PROP_NONE); @@ -3181,7 +3181,7 @@ static void rna_def_brush(BlenderRNA *brna) prop = RNA_def_property(srna, "use_frontface", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_FRONTFACE); RNA_def_property_ui_text( - prop, "Use Front-Face", "Brush only affects vertexes that face the viewer"); + prop, "Use Front-Face", "Brush only affects vertices that face the viewer"); RNA_def_property_update(prop, 0, "rna_Brush_update"); prop = RNA_def_property(srna, "use_frontface_falloff", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/modifiers/intern/MOD_explode.c b/source/blender/modifiers/intern/MOD_explode.c index e592824a522..e2fd6b418fb 100644 --- a/source/blender/modifiers/intern/MOD_explode.c +++ b/source/blender/modifiers/intern/MOD_explode.c @@ -928,7 +928,7 @@ static Mesh *explodeMesh(ExplodeModifierData *emd, ctime = BKE_scene_ctime_get(scene); - /* hash table for vertice <-> particle relations */ + /* hash table for vertex <-> particle relations */ vertpahash = BLI_edgehash_new(__func__); for (i = 0; i < totface; i++) { @@ -966,7 +966,7 @@ static Mesh *explodeMesh(ExplodeModifierData *emd, } } - /* make new vertice indexes & count total vertices after duplication */ + /* make new vertex indexes & count total vertices after duplication */ ehi = BLI_edgehashIterator_new(vertpahash); for (; !BLI_edgehashIterator_isDone(ehi); BLI_edgehashIterator_step(ehi)) { BLI_edgehashIterator_setValue(ehi, POINTER_FROM_INT(totdup)); diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c index eed5430cc10..265d2e7ec05 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c @@ -48,8 +48,8 @@ struct BLaplacianSystem { int numLoops; /* Number of edges. */ int numPolys; /* Number of faces. */ int numVerts; /* Number of verts. */ - short *numNeFa; /* Number of neighbors faces around vertice. */ - short *numNeEd; /* Number of neighbors Edges around vertice. */ + short *numNeFa; /* Number of neighbors faces around vertex. */ + short *numNeEd; /* Number of neighbors Edges around vertex. */ bool *zerola; /* Is zero area or length. */ /* Pointers to data. */ @@ -283,7 +283,7 @@ static void fill_laplacian_matrix(LaplacianSystem *sys) for (; l_next != l_term; l_prev = l_curr, l_curr = l_next, l_next++) { const uint l_curr_index = l_curr - sys->mloop; - /* Is ring if number of faces == number of edges around vertice. */ + /* Is ring if number of faces == number of edges around vertex. */ if (sys->numNeEd[l_curr->v] == sys->numNeFa[l_curr->v] && sys->zerola[l_curr->v] == false) { EIG_linear_solver_matrix_add(sys->context, l_curr->v, diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.c b/source/blender/modifiers/intern/MOD_weightvgmix.c index 1b6472e2d42..e23ee1efb19 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.c +++ b/source/blender/modifiers/intern/MOD_weightvgmix.c @@ -219,7 +219,7 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh * /* * Note that we only invert the weight values within provided vgroups, the selection based on - * which vertice is affected because it belongs or not to a group remains unchanged. + * which vertex is affected because it belongs or not to a group remains unchanged. * In other words, vertices not belonging to a group won't be affected, even though their * inverted 'virtual' weight would be 1.0f. */ diff --git a/source/blender/simulation/intern/SIM_mass_spring.cpp b/source/blender/simulation/intern/SIM_mass_spring.cpp index 5dfca5bda74..46597f80d75 100644 --- a/source/blender/simulation/intern/SIM_mass_spring.cpp +++ b/source/blender/simulation/intern/SIM_mass_spring.cpp @@ -788,7 +788,7 @@ static void cloth_calc_force( } } -/* returns vertexes' motion state */ +/* returns vertices' motion state */ BLI_INLINE void cloth_get_grid_location(Implicit_Data *data, float cell_scale, const float cell_offset[3], |