diff options
author | Leon Zandman <lzandman> | 2021-06-22 20:42:32 +0300 |
---|---|---|
committer | Harley Acheson <harley.acheson@gmail.com> | 2021-06-22 20:54:50 +0300 |
commit | c317f111c16b014a02f6d8368aa6c8815a147d06 (patch) | |
tree | d02b873a8ff59fe5a69290e2cbd61cdd1788e82c /source/blender/blenkernel | |
parent | 2fcd3f0296eff296c7a4fc2b7fc02b290ea985fd (diff) |
Cleanup: Spelling Mistakes
This patch fixes many minor spelling mistakes, all in comments or
console output. Mostly contractions like can't, won't, don't, its/it's,
etc.
Differential Revision: https://developer.blender.org/D11663
Reviewed by Harley Acheson
Diffstat (limited to 'source/blender/blenkernel')
22 files changed, 31 insertions, 31 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 092eec578c9..7d553b68185 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -345,7 +345,7 @@ void DM_interp_vert_data(struct DerivedMesh *source, void mesh_get_mapped_verts_coords(struct Mesh *me_eval, float (*r_cos)[3], const int totcos); -/* same as above but wont use render settings */ +/* same as above but won't use render settings */ struct Mesh *editbmesh_get_eval_cage(struct Depsgraph *depsgraph, struct Scene *scene, struct Object *, diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index 48b4540e3d9..0b4e1191956 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -324,7 +324,7 @@ typedef struct ModifierTypeInfo { /** * True when a deform modifier uses normals, the requiredDataMask - * cant be used here because that refers to a normal layer whereas + * can't be used here because that refers to a normal layer whereas * in this case we need to know if the deform modifier uses normals. * * this is needed because applying 2 deform modifiers will give the diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h index 170eb4ba662..8731162b720 100644 --- a/source/blender/blenkernel/BKE_pointcache.h +++ b/source/blender/blenkernel/BKE_pointcache.h @@ -33,7 +33,7 @@ extern "C" { #endif /* Point cache clearing option, for BKE_ptcache_id_clear, before - * and after are non inclusive (they wont remove the cfra) */ + * and after are non-inclusive (they won't remove the cfra) */ #define PTCACHE_CLEAR_ALL 0 #define PTCACHE_CLEAR_FRAME 1 #define PTCACHE_CLEAR_BEFORE 2 diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc index 3150e096a73..6caed3936d4 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.cc +++ b/source/blender/blenkernel/intern/DerivedMesh.cc @@ -1572,7 +1572,7 @@ static void editbmesh_calc_modifier_final_normals(Mesh *mesh_final, /* BMESH_ONLY, ensure tessface's used for drawing, * but don't recalculate if the last modifier in the stack gives us tessfaces * check if the derived meshes are DM_TYPE_EDITBMESH before calling, this isn't essential - * but quiets annoying error messages since tessfaces wont be created. */ + * but quiets annoying error messages since tessfaces won't be created. */ if (final_datamask->fmask & CD_MASK_MFACE) { if (mesh_final->edit_mesh == nullptr) { BKE_mesh_tessface_ensure(mesh_final); diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 2cd089545e8..a57e1d6b2dd 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -2381,7 +2381,7 @@ static void pose_proxy_sync(Object *ob, Object *from, int layer_protected) return; } - /* in some cases when rigs change, we cant synchronize + /* in some cases when rigs change, we can't synchronize * to avoid crashing check for possible errors here */ for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) { if (pchan->bone->layer & layer_protected) { diff --git a/source/blender/blenkernel/intern/blender_copybuffer.c b/source/blender/blenkernel/intern/blender_copybuffer.c index ec8962d5f6d..dfd49a347ca 100644 --- a/source/blender/blenkernel/intern/blender_copybuffer.c +++ b/source/blender/blenkernel/intern/blender_copybuffer.c @@ -106,7 +106,7 @@ bool BKE_copybuffer_read(Main *bmain_dst, /* Append, rather than linking. */ Library *lib = BLI_findstring(&bmain_dst->libraries, libname, offsetof(Library, filepath_abs)); BKE_library_make_local(bmain_dst, lib, NULL, true, false); - /* Important we unset, otherwise these object wont + /* Important we unset, otherwise these object won't * link into other scenes from this blend file. */ BKE_main_id_tag_all(bmain_dst, LIB_TAG_PRE_EXISTING, false); @@ -166,7 +166,7 @@ int BKE_copybuffer_paste(bContext *C, lib = BLI_findstring(&bmain->libraries, libname, offsetof(Library, filepath_abs)); BKE_library_make_local(bmain, lib, NULL, true, false); - /* important we unset, otherwise these object wont + /* important we unset, otherwise these object won't * link into other scenes from this blend file */ BKE_main_id_tag_all(bmain, LIB_TAG_PRE_EXISTING, false); diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index 54fd3f55c31..e335dd4bdcd 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -269,7 +269,7 @@ static void setup_app_data(bContext *C, } /* We need to tag this here because events may be handled immediately after. - * only the current screen is important because we wont have to handle + * only the current screen is important because we won't have to handle * events from multiple screens at once.*/ if (curscreen) { BKE_screen_gizmo_tag_refresh(curscreen); diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c index 47427beccba..f26a9f06697 100644 --- a/source/blender/blenkernel/intern/bpath.c +++ b/source/blender/blenkernel/intern/bpath.c @@ -345,7 +345,7 @@ static bool missing_files_find__recursive(char *filename_new, BLI_join_dirfile(path, sizeof(path), dirname, de->d_name); if (BLI_stat(path, &status) == -1) { - continue; /* cant stat, don't bother with this file, could print debug info here */ + continue; /* can't stat, don't bother with this file, could print debug info here */ } if (S_ISREG(status.st_mode)) { /* is file */ @@ -812,7 +812,7 @@ bool BKE_bpath_relocate_visitor(void *pathbase_v, char *path_dst, const char *pa if (BLI_path_abs(filepath, base_old)) { /* Path was relative and is now absolute. Remap. * Important BLI_path_normalize runs before the path is made relative - * because it wont work for paths that start with "//../" */ + * because it won't work for paths that start with "//../" */ BLI_path_normalize(base_new, filepath); BLI_path_rel(filepath, base_new); BLI_strncpy(path_dst, filepath, FILE_MAX); @@ -850,7 +850,7 @@ static bool bpath_list_append(void *userdata, char *UNUSED(path_dst), const char static bool bpath_list_restore(void *userdata, char *path_dst, const char *path_src) { - /* assume ls->first wont be NULL because the number of paths can't change! + /* assume ls->first won't be NULL because the number of paths can't change! * (if they do caller is wrong) */ ListBase *ls = userdata; struct PathStore *path_store = ls->first; diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 42af3a391ed..788a51257bf 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -5185,7 +5185,7 @@ static int dynamicPaint_prepareEffectStep(struct Depsgraph *depsgraph, } /* Get number of required steps using average point distance - * so that just a few ultra close pixels wont up substeps to max. */ + * so that just a few ultra close pixels won't increase substeps to max. */ /* adjust number of required substep by fastest active effect */ if (surface->effect & MOD_DPAINT_EFFECT_DO_SPREAD) { diff --git a/source/blender/blenkernel/intern/editmesh_bvh.c b/source/blender/blenkernel/intern/editmesh_bvh.c index c4f855dd8c2..9e0e1933a00 100644 --- a/source/blender/blenkernel/intern/editmesh_bvh.c +++ b/source/blender/blenkernel/intern/editmesh_bvh.c @@ -117,7 +117,7 @@ BMBVHTree *BKE_bmbvh_new_ex(BMesh *bm, for (int i = 0; i < looptris_tot; i++) { if (test_fn) { - /* note, the arrays wont align now! take care */ + /* Note: the arrays won't align now! Take care. */ f_test = looptris[i][0]->f; if (f_test != f_test_prev) { test_fn_ret = test_fn(f_test, user_data); diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index dad518ec696..7a3619154a6 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -5359,7 +5359,7 @@ int BKE_image_user_frame_get(const ImageUser *iuser, int cfra, bool *r_is_in_ran } } - /* important to apply after else we cant loop on frames 100 - 110 for eg. */ + /* important to apply after else we can't loop on frames 100 - 110 for eg. */ framenr += iuser->offset; return framenr; diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c index f26b85338f0..b7cacba20b3 100644 --- a/source/blender/blenkernel/intern/lib_id.c +++ b/source/blender/blenkernel/intern/lib_id.c @@ -1952,7 +1952,7 @@ void BKE_library_make_local(Main *bmain, } /* The check on the fourth line (LIB_TAG_PRE_EXISTING) is done so it's possible to tag data * you don't want to be made local, used for appending data, - * so any libdata already linked wont become local (very nasty + * so any libdata already linked won't become local (very nasty * to discover all your links are lost after appending). * Also, never ever make proxified objects local, would not make any sense. */ /* Some more notes: diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index 31cb21b0f00..934f9ce5018 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -1704,7 +1704,7 @@ void BKE_mesh_nomain_to_mesh(Mesh *mesh_src, tmp.texflag &= ~ME_AUTOSPACE_EVALUATED; /* Clear any run-time data. - * Even though this mesh wont typically have run-time data, the Python API can for e.g. + * Even though this mesh won't typically have run-time data, the Python API can for e.g. * create loop-triangle cache here, which is confusing when left in the mesh, see: T81136. */ BKE_mesh_runtime_clear_geometry(&tmp); diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 6b34604b1ac..3570b1dd933 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -1441,7 +1441,7 @@ static void mesh_calc_edges_mdata(MVert *UNUSED(allvert), med->flag |= ME_LOOSEEDGE; } - /* order is swapped so extruding this edge as a surface wont flip face normals + /* order is swapped so extruding this edge as a surface won't flip face normals * with cyclic curves */ if (ed->v1 + 1 != ed->v2) { SWAP(uint, med->v1, med->v2); diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 52cdf35085a..27222aeae4d 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2890,7 +2890,7 @@ void BKE_object_make_proxy(Main *bmain, Object *ob, Object *target, Object *cob) /* copy transform * - cob means this proxy comes from a collection, just apply the matrix - * so the object wont move from its dupli-transform. + * so the object won't move from its dupli-transform. * * - no cob means this is being made from a linked object, * this is closer to making a copy of the object - in-place. */ diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index a873ecec6f1..9381baa7506 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -1437,7 +1437,7 @@ static void do_particle_interpolation(ParticleSystem *psys, int point_vel = (point && point->keys->vel); float real_t, dfra, keytime, invdt = 1.0f; - /* billboards wont fill in all of these, so start cleared */ + /* billboards won't fill in all of these, so start cleared */ memset(keys, 0, sizeof(keys)); /* interpret timing and find keys */ diff --git a/source/blender/blenkernel/intern/particle_distribute.c b/source/blender/blenkernel/intern/particle_distribute.c index ad617b4198b..13f0cb28428 100644 --- a/source/blender/blenkernel/intern/particle_distribute.c +++ b/source/blender/blenkernel/intern/particle_distribute.c @@ -481,7 +481,7 @@ static void distribute_from_verts_exec(ParticleTask *thread, ParticleData *pa, i mface = ctx->mesh->mface; - int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls wont need skipping */ + int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls won't need skipping */ /* TODO_PARTICLE - use original index */ pa->num = ctx->index[p]; @@ -538,7 +538,7 @@ static void distribute_from_faces_exec(ParticleTask *thread, ParticleData *pa, i float randu, randv; int distr = ctx->distr; int i; - int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls wont need skipping */ + int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls won't need skipping */ MFace *mface; @@ -587,7 +587,7 @@ static void distribute_from_volume_exec(ParticleTask *thread, ParticleData *pa, float cur_d, min_d, randu, randv; int distr = ctx->distr; int i, intersect, tot; - int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls wont need skipping */ + int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls won't need skipping */ MFace *mface; MVert *mvert = mesh->mvert; @@ -692,7 +692,7 @@ static void distribute_children_exec(ParticleTask *thread, ChildParticle *cpa, i float randu, randv; int cfrom = ctx->cfrom; int i; - int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls wont need skipping */ + int rng_skip_tot = PSYS_RND_DIST_SKIP; /* count how many rng_* calls won't need skipping */ MFace *mf; diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 2dc752d57e1..d236dbbf101 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -1007,7 +1007,7 @@ void psys_get_birth_coords( mul_qt_v3(q_imat, rot_vec_local); /* vtan_local */ - copy_v3_v3(vtan_local, vtan); /* flips, cant use */ + copy_v3_v3(vtan_local, vtan); /* flips, can't use */ mul_qt_v3(q_imat, vtan_local); /* ensure orthogonal matrix (rot_vec aligned) */ diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 77dde3a921a..9f316ec60c0 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -2056,7 +2056,7 @@ bool ray_face_intersection_tri(const float ray_start[3], return false; } -/* Take advantage of the fact we know this wont be an intersection. +/* Take advantage of the fact we know this won't be an intersection. * Just handle ray-tri edges. */ static float dist_squared_ray_to_tri_v3_fast(const float ray_origin[3], const float ray_direction[3], diff --git a/source/blender/blenkernel/intern/report.c b/source/blender/blenkernel/intern/report.c index 43ab1a71647..c877ec6b6b0 100644 --- a/source/blender/blenkernel/intern/report.c +++ b/source/blender/blenkernel/intern/report.c @@ -107,7 +107,7 @@ void BKE_report(ReportList *reports, ReportType type, const char *_message) int len; const char *message = TIP_(_message); - /* in background mode always print otherwise there are cases the errors wont be displayed, + /* in background mode always print otherwise there are cases the errors won't be displayed, * but still add to the report list since this is used for python exception handling */ if (G.background || !reports || ((reports->flag & RPT_PRINT) && (type >= reports->printlevel))) { printf("%s: %s\n", BKE_report_type_str(type), message); diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index 5cf76bb6452..c2fb5ef4238 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -152,7 +152,7 @@ static struct bUnitDef buMetricLenDef[] = { {"micrometer", "micrometers", "µm", "um", "Micrometers", "MICROMETERS", UN_SC_UM, 0.0, B_UNIT_DEF_NONE}, /* These get displayed because of float precision problems in the transform header, - * could work around, but for now probably people wont use these. */ + * could work around, but for now probably people won't use these. */ #if 0 {"nanometer", "Nanometers", "nm", NULL, 0.000000001, 0.0, B_UNIT_DEF_NONE}, {"picometer", "Picometers", "pm", NULL, 0.000000000001, 0.0, B_UNIT_DEF_NONE}, @@ -988,7 +988,7 @@ static int unit_scale_str(char *str, memcpy(str_found, str_tmp, len_num); /* Without the string terminator. */ } - /* Since the null terminator wont be moved if the stringlen_max + /* Since the null terminator won't be moved if the stringlen_max * was not long enough to fit everything in it. */ str[len_max - 1] = '\0'; return found_ofs + len_num; @@ -1136,8 +1136,8 @@ bool BKE_unit_replace_string( strncpy(str, str_tmp, len_max); } else { - /* BLI_snprintf would not fit into str_tmp, cant do much in this case. - * Check for this because otherwise BKE_unit_replace_string could call its self forever. */ + /* BLI_snprintf would not fit into str_tmp, can't do much in this case. + * Check for this because otherwise BKE_unit_replace_string could call itself forever. */ return changed; } diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index 5e444e66a15..5fc55aad6a2 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -745,7 +745,7 @@ static int volume_sequence_frame(const Depsgraph *depsgraph, const Volume *volum } } - /* Important to apply after, else we cant loop on e.g. frames 100 - 110. */ + /* Important to apply after, else we can't loop on e.g. frames 100 - 110. */ frame += frame_offset; return frame; |