From 4da2acae3ab1a40db8be7f7df36da29cfcbf280c Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 3 Sep 2018 16:49:08 +0200 Subject: Spelling fixes in comments and descriptions, patch by luzpaz. Differential Revision: https://developer.blender.org/D3668 --- source/blender/alembic/intern/abc_archive.h | 2 +- source/blender/alembic/intern/abc_curves.cc | 2 +- source/blender/alembic/intern/abc_nurbs.cc | 4 ++-- source/blender/alembic/intern/abc_util.h | 4 ++-- source/blender/alembic/intern/alembic_capi.cc | 6 +++--- source/blender/collada/DocumentImporter.h | 2 +- source/blender/editors/animation/keyingsets.c | 4 ++-- source/blender/freestyle/intern/view_map/ViewMapIO.cpp | 4 ++-- source/blender/imbuf/IMB_imbuf_types.h | 4 ++-- source/blender/imbuf/intern/anim_movie.c | 2 +- source/blender/imbuf/intern/dds/DirectDrawSurface.cpp | 2 +- source/blender/imbuf/intern/moviecache.c | 2 +- source/blender/imbuf/intern/openexr/openexr_api.cpp | 2 +- source/blender/imbuf/intern/targa.c | 2 +- source/blender/imbuf/intern/thumbs.c | 2 +- source/blender/modifiers/intern/MOD_array.c | 2 +- source/blender/modifiers/intern/MOD_laplaciandeform.c | 6 +++--- source/blender/modifiers/intern/MOD_laplaciansmooth.c | 6 +++--- source/blender/modifiers/intern/MOD_mirror.c | 2 +- source/blender/modifiers/intern/MOD_screw.c | 10 +++++----- source/blender/modifiers/intern/MOD_simpledeform.c | 6 +++--- source/blender/modifiers/intern/MOD_solidify.c | 2 +- source/blender/modifiers/intern/MOD_surfacedeform.c | 2 +- source/blender/modifiers/intern/MOD_weightvgproximity.c | 2 +- source/blender/nodes/shader/node_shader_util.c | 2 +- source/blender/python/bmesh/bmesh_py_ops_call.c | 2 +- source/blender/python/bmesh/bmesh_py_types.c | 4 ++-- source/blender/python/bmesh/bmesh_py_types_meshdata.c | 2 +- source/blender/python/bmesh/bmesh_py_utils.c | 2 +- source/blender/python/intern/bpy_operator.c | 2 +- source/blender/python/mathutils/mathutils.c | 2 +- source/blender/python/mathutils/mathutils.h | 2 +- source/blender/python/mathutils/mathutils_Euler.c | 2 +- source/blender/python/mathutils/mathutils_Matrix.c | 6 +++--- source/blender/python/mathutils/mathutils_bvhtree.c | 2 +- 35 files changed, 55 insertions(+), 55 deletions(-) (limited to 'source') diff --git a/source/blender/alembic/intern/abc_archive.h b/source/blender/alembic/intern/abc_archive.h index 84309fbc9df..5696aed9ef3 100644 --- a/source/blender/alembic/intern/abc_archive.h +++ b/source/blender/alembic/intern/abc_archive.h @@ -53,7 +53,7 @@ public: /** * Returns true when either Blender is compiled with HDF5 support and - * the archive was succesfully opened (valid() will also return true), + * the archive was successfully opened (valid() will also return true), * or when Blender was built without HDF5 support but a HDF5 file was * detected (valid() will return false). */ diff --git a/source/blender/alembic/intern/abc_curves.cc b/source/blender/alembic/intern/abc_curves.cc index f73fe957fea..b0e2538e8bc 100644 --- a/source/blender/alembic/intern/abc_curves.cc +++ b/source/blender/alembic/intern/abc_curves.cc @@ -154,7 +154,7 @@ void AbcCurveWriter::do_write() if (nurbs->knotsu != NULL) { const size_t num_knots = KNOTSU(nurbs); - /* Add an extra knot at the beggining and end of the array since most apps + /* Add an extra knot at the beginning and end of the array since most apps * require/expect them. */ knots.resize(num_knots + 2); diff --git a/source/blender/alembic/intern/abc_nurbs.cc b/source/blender/alembic/intern/abc_nurbs.cc index eaef06fd6d1..6273507486a 100644 --- a/source/blender/alembic/intern/abc_nurbs.cc +++ b/source/blender/alembic/intern/abc_nurbs.cc @@ -103,7 +103,7 @@ static void get_knots(std::vector &knots, const int num_knots, float *nu_ return; } - /* Add an extra knot at the beggining and end of the array since most apps + /* Add an extra knot at the beginning and end of the array since most apps * require/expect them. */ knots.reserve(num_knots + 2); @@ -167,7 +167,7 @@ void AbcNurbsWriter::do_write() sample.setNu(nu->pntsu); sample.setNv(nu->pntsv); - /* TODO(kevin): to accomodate other software we should duplicate control + /* TODO(kevin): to accommodate other software we should duplicate control * points to indicate that a NURBS is cyclic. */ OCompoundProperty user_props = m_nurbs_schema[count].getUserProperties(); diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/alembic/intern/abc_util.h index 2526958111a..06eb3f140ca 100644 --- a/source/blender/alembic/intern/abc_util.h +++ b/source/blender/alembic/intern/abc_util.h @@ -167,7 +167,7 @@ typedef enum { } AbcAxisSwapMode; /* Create a rotation matrix for each axis from euler angles. - * Euler angles are swaped to change coordinate system. */ + * Euler angles are swapped to change coordinate system. */ void create_swapped_rotation_matrix( float rot_x_mat[3][3], float rot_y_mat[3][3], float rot_z_mat[3][3], const float euler[3], @@ -197,7 +197,7 @@ public: /* *************************** */ /** - * Utility class whose purpose is to more easily log related informations. An + * Utility class whose purpose is to more easily log related information. An * instance of the SimpleLogger can be created in any context, and will hold a * copy of all the strings passed to its output stream. * diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc index 0d2316ce7d9..b7c1f98bfb0 100644 --- a/source/blender/alembic/intern/alembic_capi.cc +++ b/source/blender/alembic/intern/alembic_capi.cc @@ -293,7 +293,7 @@ static void export_endjob(void *customdata) if (!data->settings.logger.empty()) { std::cerr << data->settings.logger; - WM_report(RPT_ERROR, "Errors occured during the export, look in the console to know more..."); + WM_report(RPT_ERROR, "Errors occurred during the export, look in the console to know more..."); } G.is_rendering = false; @@ -318,7 +318,7 @@ bool ABC_export( * ExportJobData contains an ExportSettings containing a SimpleLogger. * * Since ExportJobData is a C-style struct dynamically allocated with - * MEM_mallocN (see above), its construtor is never called, therefore the + * MEM_mallocN (see above), its constructor is never called, therefore the * ExportSettings constructor is not called which implies that the * SimpleLogger one is not called either. SimpleLogger in turn does not call * the constructor of its data members which ultimately means that its @@ -797,7 +797,7 @@ static void import_endjob(void *user_data) for (iter = data->readers.begin(); iter != data->readers.end(); ++iter) { Object *ob = (*iter)->object(); - /* It's possible that cancellation occured between the creation of + /* It's possible that cancellation occurred between the creation of * the reader and the creation of the Blender object. */ if (ob == NULL) continue; diff --git a/source/blender/collada/DocumentImporter.h b/source/blender/collada/DocumentImporter.h index c5bc6907867..17e61326032 100644 --- a/source/blender/collada/DocumentImporter.h +++ b/source/blender/collada/DocumentImporter.h @@ -85,7 +85,7 @@ public: /** * This method will be called if an error in the loading process occurred and the loader cannot * continue to load. The writer should undo all operations that have been performed. - * \param errorMessage A message containing informations about the error that occurred. + * \param errorMessage A message containing information about the error that occurred. */ void cancel(const COLLADAFW::String& errorMessage); diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c index 5e4db3ca61c..6962647b9b7 100644 --- a/source/blender/editors/animation/keyingsets.c +++ b/source/blender/editors/animation/keyingsets.c @@ -709,7 +709,7 @@ int ANIM_scene_get_keyingset_index(Scene *scene, KeyingSet *ks) } /* Get Keying Set to use for Auto-Keyframing some transforms */ -KeyingSet *ANIM_get_keyingset_for_autokeying(Scene *scene, const char *tranformKSName) +KeyingSet *ANIM_get_keyingset_for_autokeying(Scene *scene, const char *transformKSName) { /* get KeyingSet to use * - use the active KeyingSet if defined (and user wants to use it for all autokeying), @@ -720,7 +720,7 @@ KeyingSet *ANIM_get_keyingset_for_autokeying(Scene *scene, const char *tranformK else if (IS_AUTOKEY_FLAG(scene, INSERTAVAIL)) return ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_AVAILABLE_ID); else - return ANIM_builtin_keyingset_get_named(NULL, tranformKSName); + return ANIM_builtin_keyingset_get_named(NULL, transformKSName); } /* Menu of All Keying Sets ----------------------------- */ diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp index 3e80c004b5f..f59291d910f 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp @@ -979,7 +979,7 @@ int load(istream& in, ViewMap *vm, ProgressBar *pb) READ(flags); Options::setFlags(flags); - // Read the size of the five ViewMap's lists (with some extra informations for the ViewVertices) + // Read the size of the five ViewMap's lists (with some extra information for the ViewVertices) // and instantiate them (with default costructors) unsigned vs_s, fe_s, fe_rle1, fe_rle2, sv_s, ve_s, vv_s, vv_rle1, vv_rle2; READ(vs_s); @@ -1118,7 +1118,7 @@ int save(ostream& out, ViewMap *vm, ProgressBar *pb) unsigned char flags = Options::getFlags(); WRITE(flags); - // Write the size of the five lists (with some extra informations for the ViewVertices) + // Write the size of the five lists (with some extra information for the ViewVertices) unsigned size; size = vm->ViewShapes().size(); WRITE(size); diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h index ee51854d7ed..30a9468808c 100644 --- a/source/blender/imbuf/IMB_imbuf_types.h +++ b/source/blender/imbuf/IMB_imbuf_types.h @@ -67,7 +67,7 @@ typedef struct DDSData { */ /* ibuf->ftype flag, main image types */ -/* Warning: Keep explicit value assignements here, this file is included in areas where not all format defines +/* Warning: Keep explicit value assignments here, this file is included in areas where not all format defines * are set (e.g. intern/dds only get WITH_DDS, even if TIFF, HDR etc are also defined). See T46524. */ enum eImbTypes { IMB_FTYPE_PNG = 1, @@ -254,7 +254,7 @@ typedef struct ImBuf { #define IB_tilecache (1 << 11) #define IB_alphamode_premul (1 << 12) /* indicates whether image on disk have premul alpha */ #define IB_alphamode_detect (1 << 13) /* if this flag is set, alpha mode would be guessed from file */ -#define IB_ignore_alpha (1 << 14) /* ignore alpha on load and substitude it with 1.0f */ +#define IB_ignore_alpha (1 << 14) /* ignore alpha on load and substitute it with 1.0f */ #define IB_thumbnail (1 << 15) #define IB_multiview (1 << 16) diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 9ab2ee7dd21..89ae32ee2b3 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -1269,7 +1269,7 @@ static ImBuf *anim_getnew(struct anim *anim) #ifdef WITH_AVI case ANIM_AVI: if (startavi(anim)) { - printf("couldnt start avi\n"); + printf("couldn't start avi\n"); return (NULL); } ibuf = IMB_allocImBuf(anim->x, anim->y, 24, 0); diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp index 8e49dba5e33..9dc48fc10c8 100644 --- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp +++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp @@ -1394,7 +1394,7 @@ uint DirectDrawSurface::mipmapSize(uint mipmap) const } else if (header.pf.flags & DDPF_RGB || (header.pf.flags & DDPF_LUMINANCE)) { - uint pitch = computePitch(w, header.pf.bitcount, 8); // Asuming 8 bit alignment, which is the same D3DX expects. + uint pitch = computePitch(w, header.pf.bitcount, 8); // Assuming 8 bit alignment, which is the same D3DX expects. return pitch * h * d; } diff --git a/source/blender/imbuf/intern/moviecache.c b/source/blender/imbuf/intern/moviecache.c index daf062f5499..2a650a0c63a 100644 --- a/source/blender/imbuf/intern/moviecache.c +++ b/source/blender/imbuf/intern/moviecache.c @@ -380,7 +380,7 @@ static void do_moviecache_put(MovieCache *cache, void *userkey, ImBuf *ibuf, boo if (need_lock) BLI_mutex_unlock(&limitor_lock); - /* cache limiter can't remove unused keys which points to destoryed values */ + /* cache limiter can't remove unused keys which points to destroyed values */ check_unused_keys(cache); if (cache->points) { diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index a52ae75e87b..e8e6e0576ed 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -1021,7 +1021,7 @@ void IMB_exr_write_channels(void *handle) } for (echan = (ExrChannel *)data->channels.first; echan; echan = echan->next) { - /* Writting starts from last scanline, stride negative. */ + /* Writing starts from last scanline, stride negative. */ if (echan->use_half_float) { float *rect = echan->rect; half *cur = current_rect_half; diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c index 9d92d146f50..b83097c2eaa 100644 --- a/source/blender/imbuf/intern/targa.c +++ b/source/blender/imbuf/intern/targa.c @@ -367,7 +367,7 @@ static void complete_partial_load(struct ImBuf *ibuf, unsigned int *rect) memset(rect, 0, size); } else { - /* shouldnt happen */ + /* shouldn't happen */ printf("decodetarga: incomplete file, all pixels written\n"); } } diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c index ed7bbae6935..bfb7a041802 100644 --- a/source/blender/imbuf/intern/thumbs.c +++ b/source/blender/imbuf/intern/thumbs.c @@ -362,7 +362,7 @@ static ImBuf *thumb_create_ex( } else { if (ELEM(source, THB_SOURCE_IMAGE, THB_SOURCE_BLEND, THB_SOURCE_FONT)) { - /* only load if we didnt give an image */ + /* only load if we didn't give an image */ if (img == NULL) { switch (source) { case THB_SOURCE_IMAGE: diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index a69af265a17..d7f6c263906 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -551,7 +551,7 @@ static DerivedMesh *arrayModifier_doArray( DM_copy_loop_data(dm, result, 0, 0, chunk_nloops); DM_copy_poly_data(dm, result, 0, 0, chunk_npolys); - /* Subsurf for eg wont have mesh data in the custom data arrays. + /* Subsurf for eg won't have mesh data in the custom data arrays. * now add mvert/medge/mpoly layers. */ if (!CustomData_has_layer(&dm->vertData, CD_MVERT)) { diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.c b/source/blender/modifiers/intern/MOD_laplaciandeform.c index 81cfa980135..6f963b7f1a4 100644 --- a/source/blender/modifiers/intern/MOD_laplaciandeform.c +++ b/source/blender/modifiers/intern/MOD_laplaciandeform.c @@ -67,7 +67,7 @@ typedef struct LaplacianSystem { float (*co)[3]; /* Original vertex coordinates */ float (*no)[3]; /* Original vertex normal */ float (*delta)[3]; /* Differential Coordinates */ - unsigned int (*tris)[3]; /* Copy of MLoopTri (tesselation triangle) v1-v3 */ + unsigned int (*tris)[3]; /* Copy of MLoopTri (tessellation triangle) v1-v3 */ int *index_anchors; /* Static vertex index list */ int *unit_verts; /* Unit vectors of projected edges onto the plane orthogonal to n */ int *ringf_indices; /* Indices of faces per vertex */ @@ -209,7 +209,7 @@ static void createVertRingMap( /** * This method computes the Laplacian Matrix and Differential Coordinates for all vertex in the mesh. * The Linear system is LV = d - * Where L is Laplacian Matrix, V as the vertexes in Mesh, d is the differential coordinates + * Where L is Laplacian Matrix, V as the vertices in Mesh, d is the differential coordinates * The Laplacian Matrix is computes as a * Lij = sum(Wij) (if i == j) * Lij = Wij (if i != j) @@ -219,7 +219,7 @@ static void createVertRingMap( * di = Vi * sum(Wij) - sum(Wij * Vj) * Where : * di is the Differential Coordinate i - * sum (Wij) is the sum of all weights between vertex Vi and its vertexes neighbors (Vj) + * sum (Wij) is the sum of all weights between vertex Vi and its vertices neighbors (Vj) * sum (Wij * Vj) is the sum of the product between vertex neighbor Vj and weight Wij for all neighborhood. * * This Laplacian Matrix is described in the paper: diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.c b/source/blender/modifiers/intern/MOD_laplaciansmooth.c index 49b9c4af29c..7d26e76832d 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.c +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.c @@ -60,8 +60,8 @@ struct BLaplacianSystem { int numLoops; /* Number of edges*/ int numPolys; /* Number of faces*/ int numVerts; /* Number of verts*/ - short *numNeFa; /* Number of neighboors faces around vertice*/ - short *numNeEd; /* Number of neighboors Edges around vertice*/ + short *numNeFa; /* Number of neighbors faces around vertice*/ + short *numNeEd; /* Number of neighbors Edges around vertice*/ short *zerola; /* Is zero area or length*/ /* Pointers to data*/ @@ -268,7 +268,7 @@ static void init_laplacian_matrix(LaplacianSystem *sys) for (i = 0; i < sys->numEdges; i++) { idv1 = sys->medges[i].v1; idv2 = sys->medges[i].v2; - /* if is boundary, apply scale-dependent umbrella operator only with neighboors in boundary */ + /* if is boundary, apply scale-dependent umbrella operator only with neighbors in boundary */ if (sys->numNeEd[idv1] != sys->numNeFa[idv1] && sys->numNeEd[idv2] != sys->numNeFa[idv2]) { sys->vlengths[idv1] += sys->eweights[i]; sys->vlengths[idv2] += sys->eweights[i]; diff --git a/source/blender/modifiers/intern/MOD_mirror.c b/source/blender/modifiers/intern/MOD_mirror.c index 3f6480562d9..aeb28b3ecb0 100644 --- a/source/blender/modifiers/intern/MOD_mirror.c +++ b/source/blender/modifiers/intern/MOD_mirror.c @@ -144,7 +144,7 @@ static DerivedMesh *doMirrorOnAxis( DM_copy_poly_data(dm, result, 0, 0, maxPolys); - /* Subsurf for eg wont have mesh data in the custom data arrays. + /* Subsurf for eg won't have mesh data in the custom data arrays. * now add mvert/medge/mpoly layers. */ if (!CustomData_has_layer(&dm->vertData, CD_MVERT)) { diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index 5c1296d222e..18a551f6daa 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -57,7 +57,7 @@ /* used for gathering edge connectivity */ typedef struct ScrewVertConnect { float dist; /* distance from the center axis */ - float co[3]; /* loaction relative to the transformed axis */ + float co[3]; /* location relative to the transformed axis */ float no[3]; /* calc normal of the vertex */ unsigned int v[2]; /* 2 verts on either side of this one */ MEdge *e[2]; /* edges on either side, a bit of a waste since each edge ref's 2 edges */ @@ -297,7 +297,7 @@ static DerivedMesh *applyModifier( /* angle */ -#if 0 /* cant incluide this, not predictable enough, though quite fun. */ +#if 0 /* can't include this, not predictable enough, though quite fun. */ if (ltmd->flag & MOD_SCREW_OBJECT_ANGLE) { float mtx3_tx[3][3]; copy_m3_m4(mtx3_tx, mtx_tx); @@ -673,7 +673,7 @@ static DerivedMesh *applyModifier( if (tmpf1[ltmd->axis] < vc_tmp->co[ltmd->axis]) { /* best is above */ ed_loop_flip = 1; } - else { /* best is below or even... in even case we cant know whet to do. */ + else { /* best is below or even... in even case we can't know what to do. */ ed_loop_flip = 0; } @@ -809,7 +809,7 @@ static DerivedMesh *applyModifier( copy_v3_v3(vc->no, vc->co); } - /* we wont be looping on this data again so copy normals here */ + /* we won't be looping on this data again so copy normals here */ if ((angle < 0.0f) != do_flip) negate_v3(vc->no); @@ -897,7 +897,7 @@ static DerivedMesh *applyModifier( } if (close) { - /* last loop of edges, previous loop dosnt account for the last set of edges */ + /* last loop of edges, previous loop doesn't account for the last set of edges */ const unsigned int varray_stride = (step_tot - 1) * totvert; for (i = 0; i < totvert; i++) { diff --git a/source/blender/modifiers/intern/MOD_simpledeform.c b/source/blender/modifiers/intern/MOD_simpledeform.c index b3982bc5f3e..d14310d9199 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.c +++ b/source/blender/modifiers/intern/MOD_simpledeform.c @@ -50,7 +50,7 @@ #define BEND_EPS 0.000001f -/* Re-maps the indicies for X Y Z by shifting them up and wrapping, such that +/* Re-maps the indices for X Y Z by shifting them up and wrapping, such that * X = Y, Y = Z, Z = X (for X axis), and X = Z, Y = X, Z = Y (for Y axis). This * exists because the deformations (excluding bend) are based on the Z axis. * Having this helps avoid long, drawn out switches. */ @@ -199,7 +199,7 @@ static void SimpleDeformModifier_do( /* This is historically the lock axis, _not_ the deform axis as the name would imply */ const int deform_axis = smd->deform_axis; int lock_axis = smd->axis; - if (smd->mode == MOD_SIMPLEDEFORM_MODE_BEND) { /* Bend mode shouln't have any lock axis */ + if (smd->mode == MOD_SIMPLEDEFORM_MODE_BEND) { /* Bend mode shouldn't have any lock axis */ lock_axis = 0; } else { @@ -263,7 +263,7 @@ static void SimpleDeformModifier_do( } - /* SMD values are normalized to the BV, calculate the absolut values */ + /* SMD values are normalized to the BV, calculate the absolute values */ smd_limit[1] = lower + (upper - lower) * smd->limit[1]; smd_limit[0] = lower + (upper - lower) * smd->limit[0]; diff --git a/source/blender/modifiers/intern/MOD_solidify.c b/source/blender/modifiers/intern/MOD_solidify.c index 572898c1982..8cf288e19ae 100644 --- a/source/blender/modifiers/intern/MOD_solidify.c +++ b/source/blender/modifiers/intern/MOD_solidify.c @@ -813,7 +813,7 @@ static DerivedMesh *applyModifier( mp->flag = mpoly[fidx].flag; /* notice we use 'mp->totloop' which is later overwritten, - * we could lookup the original face but theres no point since this is a copy + * we could lookup the original face but there's no point since this is a copy * and will have the same value, just take care when changing order of assignment */ k1 = mpoly[fidx].loopstart + (((edge_order[eidx] - 1) + mp->totloop) % mp->totloop); /* prev loop */ k2 = mpoly[fidx].loopstart + (edge_order[eidx]); diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index 95347128ef9..84e2bf8941d 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -1035,7 +1035,7 @@ static bool surfacedeformBind( } else if (data.success == MOD_SDEF_BIND_RESULT_GENERIC_ERR) { /* I know this message is vague, but I could not think of a way - * to explain this whith a reasonably sized message. + * to explain this with a reasonably sized message. * Though it shouldn't really matter all that much, * because this is very unlikely to occur */ modifier_setError((ModifierData *)smd, "Target contains invalid polygons"); diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 47db0a3371f..b98036b9913 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -81,7 +81,7 @@ typedef struct Vert2GeomData { float *dist[3]; } Vert2GeomData; -/* Data which is localized to each computed chunk (i.e. thread-safe, and with continous subset of index range). */ +/* Data which is localized to each computed chunk (i.e. thread-safe, and with continuous subset of index range). */ typedef struct Vert2GeomDataChunk { /* Read-only data */ float last_hit_co[3][3]; diff --git a/source/blender/nodes/shader/node_shader_util.c b/source/blender/nodes/shader/node_shader_util.c index 3103057cbcf..90b230a280d 100644 --- a/source/blender/nodes/shader/node_shader_util.c +++ b/source/blender/nodes/shader/node_shader_util.c @@ -143,7 +143,7 @@ void node_gpu_stack_from_data(struct GPUNodeStack *gs, int type, bNodeStack *ns) memset(gs, 0, sizeof(*gs)); if (ns == NULL) { - /* node_get_stack() will generate NULL bNodeStack pointers for unknown/unsuported types of sockets... */ + /* node_get_stack() will generate NULL bNodeStack pointers for unknown/unsupported types of sockets... */ zero_v4(gs->vec); gs->link = NULL; gs->type = GPU_NONE; diff --git a/source/blender/python/bmesh/bmesh_py_ops_call.c b/source/blender/python/bmesh/bmesh_py_ops_call.c index 4dce0dc2a22..013a22fd563 100644 --- a/source/blender/python/bmesh/bmesh_py_ops_call.c +++ b/source/blender/python/bmesh/bmesh_py_ops_call.c @@ -510,7 +510,7 @@ static int bpy_slot_from_py( } /** - * Use for getting return values from an operator thats already executed. + * Use for getting return values from an operator that's already executed. * * \note Don't throw any exceptions and should always return a valid (PyObject *). */ diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index e8474efa31f..5bd938ba279 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -2453,7 +2453,7 @@ PyDoc_STRVAR(bpy_bmelemseq_index_update_doc, " .. note::\n" "\n" " Running this on sequences besides :class:`BMesh.verts`, :class:`BMesh.edges`, :class:`BMesh.faces`\n" -" works but wont result in each element having a valid index, insted its order in the sequence will be set.\n" +" works but won't result in each element having a valid index, insted its order in the sequence will be set.\n" ); static PyObject *bpy_bmelemseq_index_update(BPy_BMElemSeq *self) { @@ -4050,7 +4050,7 @@ int BPy_BMElem_CheckHType(PyTypeObject *type, const char htype) /** * Use for error strings only, not thread safe, * - * \return a sting like '(BMVert/BMEdge/BMFace/BMLoop)' + * \return a string like '(BMVert/BMEdge/BMFace/BMLoop)' */ char *BPy_BMElem_StringFromHType_ex(const char htype, char ret[32]) { diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index 97e64fd376e..e4a2cb8fbbc 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -478,7 +478,7 @@ PyObject *BPy_BMLoopColor_CreatePyObject(struct MLoopCol *data) * This type could eventually be used to access lattice weights. * * \note: Many of blender-api's dict-like-wrappers act like ordered dicts, - * This is intentional _not_ ordered, the weights can be in any order and it wont matter, + * This is intentionally _not_ ordered, the weights can be in any order and it won't matter, * the order should not be used in the api in any meaningful way (as with a python dict) * only expose as mapping, not a sequence. */ diff --git a/source/blender/python/bmesh/bmesh_py_utils.c b/source/blender/python/bmesh/bmesh_py_utils.c index ca34de219b8..701dd5fbc19 100644 --- a/source/blender/python/bmesh/bmesh_py_utils.c +++ b/source/blender/python/bmesh/bmesh_py_utils.c @@ -438,7 +438,7 @@ PyDoc_STRVAR(bpy_bm_utils_face_split_doc, " :type vert_a: :class:`bmesh.types.BMVert`\n" " :arg vert_b: Second vertex to cut in the face (face must contain the vert).\n" " :type vert_b: :class:`bmesh.types.BMVert`\n" -" :arg coords: Optional argument to define points inbetween *vert_a* and *vert_b*.\n" +" :arg coords: Optional argument to define points in between *vert_a* and *vert_b*.\n" " :type coords: sequence of float triplets\n" " :arg use_exist: .Use an existing edge if it exists (Only used when *coords* argument is empty or omitted)\n" " :type use_exist: boolean\n" diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c index 4652da2018c..4183970c9a1 100644 --- a/source/blender/python/intern/bpy_operator.c +++ b/source/blender/python/intern/bpy_operator.c @@ -124,7 +124,7 @@ static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args) CTX_py_dict_set(C, (void *)context_dict); Py_XINCREF(context_dict); /* so we done loose it */ - /* main purpose of thsi function */ + /* main purpose of this function */ ret = WM_operator_poll_context((bContext *)C, ot, context) ? Py_True : Py_False; /* restore with original context dict, probably NULL but need this for nested operator calls */ diff --git a/source/blender/python/mathutils/mathutils.c b/source/blender/python/mathutils/mathutils.c index 0c365ad192c..a3a4e7f313b 100644 --- a/source/blender/python/mathutils/mathutils.c +++ b/source/blender/python/mathutils/mathutils.c @@ -405,7 +405,7 @@ int EXPP_VectorsAreEqual(const float *vecA, const float *vecB, int size, int flo } #ifndef MATH_STANDALONE -/* dynstr as python string utility funcions, frees 'ds'! */ +/* dynstr as python string utility functions, frees 'ds'! */ PyObject *mathutils_dynstr_to_py(struct DynStr *ds) { const int ds_len = BLI_dynstr_get_len(ds); /* space for \0 */ diff --git a/source/blender/python/mathutils/mathutils.h b/source/blender/python/mathutils/mathutils.h index b151ba7280d..286dd9f0750 100644 --- a/source/blender/python/mathutils/mathutils.h +++ b/source/blender/python/mathutils/mathutils.h @@ -170,7 +170,7 @@ Py_hash_t mathutils_array_hash(const float *float_array, size_t array_len); int column_vector_multiplication(float rvec[4], VectorObject *vec, MatrixObject *mat); #ifndef MATH_STANDALONE -/* dynstr as python string utility funcions */ +/* dynstr as python string utility functions */ PyObject *mathutils_dynstr_to_py(struct DynStr *ds); #endif diff --git a/source/blender/python/mathutils/mathutils_Euler.c b/source/blender/python/mathutils/mathutils_Euler.c index 8be3de42226..31576c32497 100644 --- a/source/blender/python/mathutils/mathutils_Euler.c +++ b/source/blender/python/mathutils/mathutils_Euler.c @@ -161,7 +161,7 @@ PyDoc_STRVAR(Euler_to_matrix_doc, "\n" " Return a matrix representation of the euler.\n" "\n" -" :return: A 3x3 roation matrix representation of the euler.\n" +" :return: A 3x3 rotation matrix representation of the euler.\n" " :rtype: :class:`Matrix`\n" ); static PyObject *Euler_to_matrix(EulerObject *self) diff --git a/source/blender/python/mathutils/mathutils_Matrix.c b/source/blender/python/mathutils/mathutils_Matrix.c index 70c400f99b8..951c094ec40 100644 --- a/source/blender/python/mathutils/mathutils_Matrix.c +++ b/source/blender/python/mathutils/mathutils_Matrix.c @@ -2592,7 +2592,7 @@ static int Matrix_translation_set(MatrixObject *self, PyObject *value, void *UNU } PyDoc_STRVAR(Matrix_row_doc, -"Access the matix by rows (default), (read-only).\n\n:type: Matrix Access" +"Access the matrix by rows (default), (read-only).\n\n:type: Matrix Access" ); static PyObject *Matrix_row_get(MatrixObject *self, void *UNUSED(closure)) { @@ -2600,7 +2600,7 @@ static PyObject *Matrix_row_get(MatrixObject *self, void *UNUSED(closure)) } PyDoc_STRVAR(Matrix_col_doc, -"Access the matix by colums, 3x3 and 4x4 only, (read-only).\n\n:type: Matrix Access" +"Access the matrix by columns, 3x3 and 4x4 only, (read-only).\n\n:type: Matrix Access" ); static PyObject *Matrix_col_get(MatrixObject *self, void *UNUSED(closure)) { @@ -2770,7 +2770,7 @@ PyDoc_STRVAR(matrix_doc, " matrices from 2x2 up to 4x4.\n" "\n" " :param rows: Sequence of rows.\n" -" When ommitted, a 4x4 identity matrix is constructed.\n" +" When omitted, a 4x4 identity matrix is constructed.\n" " :type rows: 2d number sequence\n" ); PyTypeObject matrix_Type = { diff --git a/source/blender/python/mathutils/mathutils_bvhtree.c b/source/blender/python/mathutils/mathutils_bvhtree.c index c044cc54965..36727fb91ae 100644 --- a/source/blender/python/mathutils/mathutils_bvhtree.c +++ b/source/blender/python/mathutils/mathutils_bvhtree.c @@ -579,7 +579,7 @@ PyDoc_STRVAR(py_bvhtree_overlap_doc, "\n" " Find overlapping indices between 2 trees.\n" "\n" -" :arg other_tree: Other tree to preform overlap test on.\n" +" :arg other_tree: Other tree to perform overlap test on.\n" " :type other_tree: :class:`BVHTree`\n" " :return: Returns a list of unique index pairs," " the first index referencing this tree, the second referencing the **other_tree**.\n" -- cgit v1.2.3