From ac646bc20dafe176c1b84ee5beddf980aba11358 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 31 Aug 2019 01:19:22 +1000 Subject: Cleanup: spelling --- intern/cycles/render/session.cpp | 2 +- intern/ffmpeg/ffmpeg_compat.h | 2 +- intern/ghost/GHOST_C-api.h | 2 +- intern/ghost/GHOST_ISystem.h | 2 +- source/blender/blenfont/intern/blf_thumbs.c | 2 +- source/blender/blenkernel/intern/pointcache.c | 5 ++++- source/blender/blenkernel/intern/tracking_solver.c | 2 +- source/blender/blenlib/intern/math_geom.c | 2 +- source/blender/bmesh/operators/bmo_inset.c | 2 +- source/blender/depsgraph/intern/builder/deg_builder_cycle.cc | 2 +- source/blender/editors/animation/anim_filter.c | 5 ++--- source/blender/editors/include/UI_interface.h | 2 +- source/blender/editors/interface/interface.c | 2 +- source/blender/editors/interface/interface_draw.c | 2 +- source/blender/editors/interface/interface_handlers.c | 2 +- source/blender/editors/interface/interface_icons.c | 4 ++-- source/blender/editors/mesh/editmesh_tools.c | 2 +- source/blender/editors/object/object_constraint.c | 4 ++-- source/blender/editors/space_text/text_ops.c | 2 +- source/blender/makesdna/DNA_object_types.h | 8 +++++--- source/blender/makesdna/DNA_userdef_types.h | 2 +- source/blender/makesdna/intern/dna_genfile.c | 2 +- source/blender/makesrna/intern/rna_mesh.c | 2 +- source/blender/makesrna/intern/rna_modifier.c | 2 +- source/blender/modifiers/intern/MOD_armature.c | 2 +- source/blender/modifiers/intern/MOD_array.c | 2 +- source/blender/modifiers/intern/MOD_boolean.c | 2 +- source/blender/modifiers/intern/MOD_curve.c | 2 +- source/blender/modifiers/intern/MOD_datatransfer.c | 2 +- source/blender/modifiers/intern/MOD_lattice.c | 2 +- source/blender/modifiers/intern/MOD_mask.c | 2 +- source/blender/modifiers/intern/MOD_meshdeform.c | 2 +- source/blender/modifiers/intern/MOD_particleinstance.c | 2 +- source/blender/modifiers/intern/MOD_shrinkwrap.c | 2 +- source/blender/modifiers/intern/MOD_surfacedeform.c | 2 +- 35 files changed, 45 insertions(+), 41 deletions(-) diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp index 157bb6d63d3..332f1fb6167 100644 --- a/intern/cycles/render/session.cpp +++ b/intern/cycles/render/session.cpp @@ -232,7 +232,7 @@ void Session::run_gpu() } /* Don't go in pause mode when image was rendered with preview kernels - * When feature kernels become available the session will be resetted. */ + * When feature kernels become available the session will be reset. */ else if (no_tiles && kernel_state == DEVICE_KERNEL_WAITING_FOR_FEATURE_KERNEL) { time_sleep(0.1); } diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index 863fbd40bb0..d254fa76ba9 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -364,7 +364,7 @@ void avcodec_free_frame(AVFrame **frame) # define avio_size url_fsize #endif -/* there are some version inbetween, which have avio_... functions but no +/* There are some version in between, which have avio_... functions but no * AVIO_FLAG_... */ #ifndef AVIO_FLAG_WRITE # define AVIO_FLAG_WRITE URL_WRONLY diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h index 0f735711b24..9c6a0861280 100644 --- a/intern/ghost/GHOST_C-api.h +++ b/intern/ghost/GHOST_C-api.h @@ -477,7 +477,7 @@ extern GHOST_TEventDataPtr GHOST_GetEventData(GHOST_EventHandle eventhandle); /** * Returns the timer callback. - * \param timertaskhandle The handle to the timertask + * \param timertaskhandle The handle to the timer-task. * \return The timer callback. */ extern GHOST_TimerProcPtr GHOST_GetTimerProc(GHOST_TimerTaskHandle timertaskhandle); diff --git a/intern/ghost/GHOST_ISystem.h b/intern/ghost/GHOST_ISystem.h index f0ceb7fb8ba..27be80a2f20 100644 --- a/intern/ghost/GHOST_ISystem.h +++ b/intern/ghost/GHOST_ISystem.h @@ -402,7 +402,7 @@ class GHOST_ISystem { #ifdef WITH_INPUT_NDOF /** * Sets 3D mouse deadzone - * \param deadzone: Deadzone of the 3D mouse (both for rotation and pan) relative to full range + * \param deadzone: Dead-zone of the 3D mouse (both for rotation and pan) relative to full range */ virtual void setNDOFDeadZone(float deadzone) = 0; #endif diff --git a/source/blender/blenfont/intern/blf_thumbs.c b/source/blender/blenfont/intern/blf_thumbs.c index d6710b91539..4e44a85443d 100644 --- a/source/blender/blenfont/intern/blf_thumbs.c +++ b/source/blender/blenfont/intern/blf_thumbs.c @@ -109,7 +109,7 @@ void BLF_thumb_preview(const char *filename, font->pos[1] -= font->glyph_cache->ascender * 1.1f; /* We fallback to default english strings in case not enough chars are available in current - * font for given translated string (useful in non-latin i18n context, like chinese, + * font for given translated string (useful in non-latin i18n context, like Chinese, * since many fonts will then show nothing but ugly 'missing char' in their preview). * Does not handle all cases, but much better than nothing. */ diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 5f073120383..a31cb96c6c9 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -1831,7 +1831,10 @@ void BKE_ptcache_id_from_rigidbody(PTCacheID *pid, Object *ob, RigidBodyWorld *r pid->file_type = PTCACHE_FILE_PTCACHE; } -/** Both \param ob and \param scene may be NULL. */ +/** + * \param ob: Optional, may be NULL. + * \param scene: Optional may be NULL. + */ PTCacheID BKE_ptcache_id_find(Object *ob, Scene *scene, PointCache *cache) { PTCacheID result = {0}; diff --git a/source/blender/blenkernel/intern/tracking_solver.c b/source/blender/blenkernel/intern/tracking_solver.c index 7e7a839b645..ab741eed410 100644 --- a/source/blender/blenkernel/intern/tracking_solver.c +++ b/source/blender/blenkernel/intern/tracking_solver.c @@ -221,7 +221,7 @@ static bool reconstruct_retrieve_libmv_tracks(MovieReconstructContext *context, * * There's one weak part tho, which is requirement object * motion starts at the same frame as camera motion does, - * otherwise that;' be a russian roulette whether object is + * otherwise that;' be a Russian roulette whether object is * aligned correct or not. */ if (!origin_set) { diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index fc65563b99d..f1575ed2b2d 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -1358,7 +1358,7 @@ bool isect_seg_seg_v2_simple(const float v1[2], /** * If intersection == ISECT_LINE_LINE_CROSS or ISECT_LINE_LINE_NONE: * 
- * pt = v1 + lamba * (v2 - v1) = v3 + mu * (v4 - v3)
+ * pt = v1 + lambda * (v2 - v1) = v3 + mu * (v4 - v3)
  *
* \returns intersection type: * - ISECT_LINE_LINE_COLINEAR: collinear. diff --git a/source/blender/bmesh/operators/bmo_inset.c b/source/blender/bmesh/operators/bmo_inset.c index f23c420295b..1570c802bee 100644 --- a/source/blender/bmesh/operators/bmo_inset.c +++ b/source/blender/bmesh/operators/bmo_inset.c @@ -588,7 +588,7 @@ void bmo_inset_region_exec(BMesh *bm, BMOperator *op) /* tag if boundary is enabled */ (use_boundary && BM_edge_is_boundary(e) && BM_elem_flag_test(e->l->f, BM_ELEM_TAG)) || - /* tag if edge is an interior edge inbetween a tagged and untagged face */ + /* tag if edge is an interior edge in between a tagged and untagged face */ (bm_edge_is_mixed_face_tag(e->l))) { /* tag */ BM_elem_flag_enable(e->v1, BM_ELEM_TAG); diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc index d11a60b77dd..bfb1a981c4d 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc @@ -149,7 +149,7 @@ bool check_relation_can_murder(Relation *relation) Relation *select_relation_to_murder(Relation *relation, StackEntry *cycle_start_entry) { - /* More or less russian roulette solver, which will make sure only + /* More or less Russian roulette solver, which will make sure only * specially marked relations are kept alive. * * TODO(sergey): There might be better strategies here. */ diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index a78a63f1347..48493c9e961 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -630,9 +630,8 @@ static bAnimListElem *make_new_animlistelem(void *data, /* do specifics */ switch (datatype) { case ANIMTYPE_SUMMARY: { - /* nothing to include for now... this is just a dummy wrappy around all the other channels - * in the DopeSheet, and gets included at the start of the list - */ + /* Nothing to include for now... this is just a dummy wrapper around + * all the other channels in the DopeSheet, and gets included at the start of the list. */ ale->key_data = NULL; ale->datatype = ALE_ALL; break; diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index a61daa11c36..aa1044647c8 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -89,7 +89,7 @@ typedef struct uiPopupBlockHandle uiPopupBlockHandle; * For #ARegion.overlap regions, pass events though if they don't overlap * the regions contents (the usable part of the #View2D and buttons). * - * The margin is needed so it's not possible to accidentally click inbetween buttons. + * The margin is needed so it's not possible to accidentally click in between buttons. */ #define UI_REGION_OVERLAP_MARGIN (U.widget_unit / 3) diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 0855412bcc4..ee354df3a25 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -3587,7 +3587,7 @@ static uiBut *ui_def_but(uiBlock *block, } /* Number buttons must have a click-step, - * assert instead of correcting the value to ensure the caller knowns what they're doing. */ + * assert instead of correcting the value to ensure the caller knows what they're doing. */ if ((type & BUTTYPE) == UI_BTYPE_NUM) { if (ELEM((type & UI_BUT_POIN_TYPES), UI_BUT_POIN_CHAR, UI_BUT_POIN_SHORT, UI_BUT_POIN_INT)) { BLI_assert((int)a1 > 0); diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 76630de96db..b7a0812c5f2 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -750,7 +750,7 @@ void ui_draw_but_IMAGE(ARegion *UNUSED(ar), /** * Draw title and text safe areas. * - * \Note This functionn is to be used with the 2D dashed shader enabled. + * \note This function is to be used with the 2D dashed shader enabled. * * \param pos: is a PRIM_FLOAT, 2, GPU_FETCH_FLOAT vertex attribute. * \param line_origin: is a PRIM_FLOAT, 2, GPU_FETCH_FLOAT vertex attribute. diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 13bfaa95077..55980099116 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -2760,7 +2760,7 @@ static void ui_textedit_set_cursor_pos(uiBut *but, uiHandleButtonData *data, con startx += UI_DPI_ICON_SIZE / aspect; } } - /* but this extra .05 makes clicks inbetween characters feel nicer */ + /* But this extra .05 makes clicks in between characters feel nicer. */ startx += ((UI_TEXT_MARGIN_X + 0.05f) * U.widget_unit) / aspect; /* mouse dragged outside the widget to the left */ diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 1674374396f..524474cce88 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -154,8 +154,8 @@ typedef struct IconType { } IconType; /* ******************* STATIC LOCAL VARS ******************* */ -/* static here to cache results of icon directory scan, so it's not - * scanning the filesystem each time the menu is drawn */ +/* Static here to cache results of icon directory scan, so it's not + * scanning the file-system each time the menu is drawn. */ static struct ListBase iconfilelist = {NULL, NULL}; static IconTexture icongltex = {{0, 0}, 0, 0, 0, 0.0f, 0.0f}; diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 2b0213dc1ef..b88b6cbb3a6 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -5711,7 +5711,7 @@ void MESH_OT_dissolve_limited(wmOperatorType *ot) "use_dissolve_boundaries", false, "All Boundaries", - "Dissolve all vertices inbetween face boundaries"); + "Dissolve all vertices in between face boundaries"); RNA_def_enum_flag(ot->srna, "delimit", rna_enum_mesh_delimit_mode_items, diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 14813f9a936..8981221cb9c 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -496,7 +496,7 @@ static void test_constraint( /* The object type check is only needed here in case we have a placeholder * object assigned (because the library containing the curve is missing). * - * In other cases it should be impossible to have a type missmatch. + * In other cases it should be impossible to have a type mismatch. */ if (ct->tar->type != OB_CURVE) { con->flag |= CONSTRAINT_DISABLE; @@ -514,7 +514,7 @@ static void test_constraint( /* The object type check is only needed here in case we have a placeholder * object assigned (because the library containing the armature is missing). * - * In other cases it should be impossible to have a type missmatch. + * In other cases it should be impossible to have a type mismatch. */ if (ct->tar->type != OB_ARMATURE) { con->flag |= CONSTRAINT_DISABLE; diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index e1550deb659..caefb5070fb 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -142,7 +142,7 @@ static char *buf_tabs_to_spaces(const char *in_buf, const int tab_size) BLI_INLINE int text_pixel_x_to_column(SpaceText *st, const int x) { - /* add half the char width so mouse cursor selection is inbetween letters */ + /* Add half the char width so mouse cursor selection is in between letters. */ return (x + (st->cwidth / 2)) / st->cwidth; } diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index e006014b71f..613871b1fee 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -162,12 +162,14 @@ typedef struct Object_Runtime { struct Mesh *mesh_eval; /** * Mesh structure created during object evaluation. - * It has deforemation only modifiers applied on it. + * It has deformation only modifiers applied on it. */ struct Mesh *mesh_deform_eval; - /* This is a mesh representation of corresponding object. - * It created when Python calls `object.to_mesh()`. */ + /** + * This is a mesh representation of corresponding object. + * It created when Python calls `object.to_mesh()`. + */ struct Mesh *object_as_temp_mesh; /** Runtime evaluated curve-specific data, not stored in the file. */ diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 3cb96ce8bf8..8eabbc0df0d 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -717,7 +717,7 @@ typedef struct UserDef { /** Overall sensitivity of 3D mouse. */ float ndof_sensitivity; float ndof_orbit_sensitivity; - /** Deadzone of 3D mouse. */ + /** Dead-zone of 3D mouse. */ float ndof_deadzone; /** #eNdof_Flag, flags for 3D mouse. */ int ndof_flag; diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index 86ba306fc6a..09a7a157996 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -1102,7 +1102,7 @@ static void reconstruct_elem(const SDNA *newsdna, * - cast type * - name partially equal (array differs) * - type equal: memcpy - * - types casten + * - type cast (per element). * (nzc 2-4-2001 I want the 'unsigned' bit to be parsed as well. Where * can I force this?) */ diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 81480eda4d6..f7e0990aa88 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1370,7 +1370,7 @@ static int rna_MeshPolygonStringPropertyLayer_data_length(PointerRNA *ptr) } /* XXX, we dont have proper byte string support yet, so for now use the (bytes + 1) - * bmesh API exposes correct python/bytestring access */ + * bmesh API exposes correct python/byte-string access. */ void rna_MeshStringProperty_s_get(PointerRNA *ptr, char *value) { MStringProperty *ms = (MStringProperty *)ptr->data; diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index d333d8eddaf..712fe2a9984 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -2062,7 +2062,7 @@ static void rna_def_modifier_decimate(BlenderRNA *brna) prop = RNA_def_property(srna, "use_dissolve_boundaries", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_DECIM_FLAG_ALL_BOUNDARY_VERTS); RNA_def_property_ui_text( - prop, "All Boundaries", "Dissolve all vertices inbetween face boundaries (planar only)"); + prop, "All Boundaries", "Dissolve all vertices in between face boundaries (planar only)"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); prop = RNA_def_property(srna, "delimit", PROP_ENUM, PROP_NONE); diff --git a/source/blender/modifiers/intern/MOD_armature.c b/source/blender/modifiers/intern/MOD_armature.c index 522b387411b..9f3802a4fa1 100644 --- a/source/blender/modifiers/intern/MOD_armature.c +++ b/source/blender/modifiers/intern/MOD_armature.c @@ -82,7 +82,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene), /* The object type check is only needed here in case we have a placeholder * object assigned (because the library containing the armature is missing). * - * In other cases it should be impossible to have a type missmatch. + * In other cases it should be impossible to have a type mismatch. */ return !amd->object || amd->object->type != OB_ARMATURE; } diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 48718a47419..9e368d2c050 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -775,7 +775,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene), /* The object type check is only needed here in case we have a placeholder * object assigned (because the library containing the curve/mesh is missing). * - * In other cases it should be impossible to have a type missmatch. + * In other cases it should be impossible to have a type mismatch. */ if (amd->curve_ob && amd->curve_ob->type != OB_CURVE) { diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index ea42ddb03f4..e55eeddbfa5 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -74,7 +74,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene), /* The object type check is only needed here in case we have a placeholder * object assigned (because the library containing the mesh is missing). * - * In other cases it should be impossible to have a type missmatch. + * In other cases it should be impossible to have a type mismatch. */ return !bmd->object || bmd->object->type != OB_MESH; } diff --git a/source/blender/modifiers/intern/MOD_curve.c b/source/blender/modifiers/intern/MOD_curve.c index bedd6e519eb..f9137572d6f 100644 --- a/source/blender/modifiers/intern/MOD_curve.c +++ b/source/blender/modifiers/intern/MOD_curve.c @@ -69,7 +69,7 @@ static bool isDisabled(const Scene *UNUSED(scene), ModifierData *md, bool UNUSED /* The object type check is only needed here in case we have a placeholder * object assigned (because the library containing the curve is missing). * - * In other cases it should be impossible to have a type missmatch. + * In other cases it should be impossible to have a type mismatch. */ return !cmd->object || cmd->object->type != OB_CURVE; } diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c index fa60bd2a502..bb032f9725c 100644 --- a/source/blender/modifiers/intern/MOD_datatransfer.c +++ b/source/blender/modifiers/intern/MOD_datatransfer.c @@ -146,7 +146,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene), /* The object type check is only needed here in case we have a placeholder * object assigned (because the library containing the mesh is missing). * - * In other cases it should be impossible to have a type missmatch. + * In other cases it should be impossible to have a type mismatch. */ return !dtmd->ob_source || dtmd->ob_source->type != OB_MESH; } diff --git a/source/blender/modifiers/intern/MOD_lattice.c b/source/blender/modifiers/intern/MOD_lattice.c index aca5b43a7d5..a73e96da975 100644 --- a/source/blender/modifiers/intern/MOD_lattice.c +++ b/source/blender/modifiers/intern/MOD_lattice.c @@ -67,7 +67,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene), /* The object type check is only needed here in case we have a placeholder * object assigned (because the library containing the lattice is missing). * - * In other cases it should be impossible to have a type missmatch. + * In other cases it should be impossible to have a type mismatch. */ return !lmd->object || lmd->object->type != OB_LATTICE; } diff --git a/source/blender/modifiers/intern/MOD_mask.c b/source/blender/modifiers/intern/MOD_mask.c index bc218114432..df8f68862e6 100644 --- a/source/blender/modifiers/intern/MOD_mask.c +++ b/source/blender/modifiers/intern/MOD_mask.c @@ -353,7 +353,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene), /* The object type check is only needed here in case we have a placeholder * object assigned (because the library containing the armature is missing). * - * In other cases it should be impossible to have a type missmatch. + * In other cases it should be impossible to have a type mismatch. */ return mmd->ob_arm && mmd->ob_arm->type != OB_ARMATURE; } diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c index 7ddce983c2a..408e38f43ab 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.c +++ b/source/blender/modifiers/intern/MOD_meshdeform.c @@ -142,7 +142,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene), /* The object type check is only needed here in case we have a placeholder * object assigned (because the library containing the mesh is missing). * - * In other cases it should be impossible to have a type missmatch. + * In other cases it should be impossible to have a type mismatch. */ return !mmd->object || mmd->object->type != OB_MESH; } diff --git a/source/blender/modifiers/intern/MOD_particleinstance.c b/source/blender/modifiers/intern/MOD_particleinstance.c index 01f1aeffdb2..49bb8691764 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.c +++ b/source/blender/modifiers/intern/MOD_particleinstance.c @@ -83,7 +83,7 @@ static bool isDisabled(const struct Scene *scene, ModifierData *md, bool useRend /* The object type check is only needed here in case we have a placeholder * object assigned (because the library containing the mesh is missing). * - * In other cases it should be impossible to have a type missmatch. + * In other cases it should be impossible to have a type mismatch. */ if (!pimd->ob || pimd->ob->type != OB_MESH) { return true; diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.c b/source/blender/modifiers/intern/MOD_shrinkwrap.c index 408ec06a49c..4bca48852a2 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.c +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.c @@ -79,7 +79,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene), /* The object type check is only needed here in case we have a placeholder * object assigned (because the library containing the mesh is missing). * - * In other cases it should be impossible to have a type missmatch. + * In other cases it should be impossible to have a type mismatch. */ if (!smd->target || smd->target->type != OB_MESH) { return true; diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index 93196ea21fb..b34688d27d6 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -1282,7 +1282,7 @@ static bool isDisabled(const Scene *UNUSED(scene), ModifierData *md, bool UNUSED /* The object type check is only needed here in case we have a placeholder * object assigned (because the library containing the mesh is missing). * - * In other cases it should be impossible to have a type missmatch. + * In other cases it should be impossible to have a type mismatch. */ return (smd->target == NULL || smd->target->type != OB_MESH) && !(smd->verts != NULL && !(smd->flags & MOD_SDEF_BIND)); -- cgit v1.2.3