From 342e73f90fc5c41af8db3a6e3dfdf1746f7f5bc4 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 24 Sep 2018 18:46:51 +0200 Subject: Spelling fixes in comments and descriptions (2.8 changes), patch by luzpaz. Differential Revision: https://developer.blender.org/D3719 --- source/blender/blenkernel/BKE_modifier.h | 2 +- source/blender/blenkernel/BKE_movieclip.h | 2 +- source/blender/blenkernel/BKE_subdiv_ccg.h | 2 +- source/blender/blenkernel/BKE_subdiv_mesh.h | 2 +- source/blender/blenkernel/intern/DerivedMesh.c | 2 +- source/blender/blenkernel/intern/armature.c | 6 +++--- source/blender/blenkernel/intern/blender_undo.c | 2 +- source/blender/blenkernel/intern/brush.c | 2 +- source/blender/blenkernel/intern/cloth.c | 6 +++--- source/blender/blenkernel/intern/collection.c | 2 +- source/blender/blenkernel/intern/font.c | 2 +- source/blender/blenkernel/intern/gpencil_modifier.c | 4 ++-- source/blender/blenkernel/intern/library.c | 2 +- source/blender/blenkernel/intern/library_override.c | 14 +++++++------- source/blender/blenkernel/intern/library_query.c | 2 +- source/blender/blenkernel/intern/mesh.c | 2 +- source/blender/blenkernel/intern/mesh_convert.c | 2 +- source/blender/blenkernel/intern/mesh_runtime.c | 2 +- source/blender/blenkernel/intern/modifier.c | 2 +- source/blender/blenkernel/intern/multires_reshape.c | 4 ++-- source/blender/blenkernel/intern/object.c | 2 +- source/blender/blenkernel/intern/scene.c | 2 +- source/blender/blenkernel/intern/shader_fx.c | 2 +- source/blender/blenkernel/intern/smoke.c | 2 +- source/blender/blenkernel/intern/subdiv_ccg.c | 2 +- source/blender/blenkernel/intern/subdiv_foreach.c | 14 +++++++------- source/blender/blenkernel/intern/subdiv_mesh.c | 8 ++++---- 27 files changed, 48 insertions(+), 48 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index 52015ff025d..eb08db93bd0 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -464,7 +464,7 @@ struct Mesh *modifier_applyModifier_ensure_normals( struct ModifierData *md, const struct ModifierEvalContext *ctx, struct Mesh *mesh); -/* depricated variants of above that accept DerivedMesh */ +/* deprecated variants of above that accept DerivedMesh */ void modifier_deformVerts_DM_deprecated( struct ModifierData *md, const struct ModifierEvalContext *ctx, diff --git a/source/blender/blenkernel/BKE_movieclip.h b/source/blender/blenkernel/BKE_movieclip.h index ee8e22048a1..5071724d772 100644 --- a/source/blender/blenkernel/BKE_movieclip.h +++ b/source/blender/blenkernel/BKE_movieclip.h @@ -88,7 +88,7 @@ bool BKE_movieclip_put_frame_if_possible(struct MovieClip *clip, struct MovieCli void BKE_movieclip_eval_update(struct Depsgraph *depsgraph, struct MovieClip *clip); void BKE_movieclip_eval_selection_update(struct Depsgraph *depsgraph, struct MovieClip *clip); -/* cacheing flags */ +/* caching flags */ #define MOVIECLIP_CACHE_SKIP (1 << 0) /* postprocessing flags */ diff --git a/source/blender/blenkernel/BKE_subdiv_ccg.h b/source/blender/blenkernel/BKE_subdiv_ccg.h index fa3782bbd0f..b2aaf6fc4cc 100644 --- a/source/blender/blenkernel/BKE_subdiv_ccg.h +++ b/source/blender/blenkernel/BKE_subdiv_ccg.h @@ -72,7 +72,7 @@ typedef struct SubdivToCCGSettings { /* Resolution at which regular ptex (created for quad polygon) are being * evaluated. This defines how many vertices final mesh will have: every * regular ptex has resolution^2 vertices. Special (irregular, or ptex - * crated for a corner of non-quad polygon) will have resolution of + * created for a corner of non-quad polygon) will have resolution of * `resolution - 1`. */ int resolution; diff --git a/source/blender/blenkernel/BKE_subdiv_mesh.h b/source/blender/blenkernel/BKE_subdiv_mesh.h index 59e96edd154..f719527eed8 100644 --- a/source/blender/blenkernel/BKE_subdiv_mesh.h +++ b/source/blender/blenkernel/BKE_subdiv_mesh.h @@ -41,7 +41,7 @@ typedef struct SubdivToMeshSettings { /* Resolution at which regular ptex (created for quad polygon) are being * evaluated. This defines how many vertices final mesh will have: every * regular ptex has resolution^2 vertices. Special (irregular, or ptex - * crated for a corner of non-quad polygon) will have resolution of + * created for a corner of non-quad polygon) will have resolution of * `resolution - 1`. */ int resolution; diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index d37664e0074..76986b8c61c 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -3446,7 +3446,7 @@ void DM_init_origspace(DerivedMesh *dm) scale[1] = 1e-9f; invert_v2(scale); - /* Finally, transform all vcos_2d into ((0, 0), (1, 1)) square and assing them as origspace. */ + /* Finally, transform all vcos_2d into ((0, 0), (1, 1)) square and assign them as origspace. */ for (j = 0; j < mp->totloop; j++, lof++) { add_v2_v2v2(lof->uv, vcos_2d[j], translate); mul_v2_v2(lof->uv, scale); diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 83e5e4fe3f7..a5eb49756bb 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -1478,7 +1478,7 @@ void BKE_armature_mat_pose_to_bone_ex(struct Depsgraph *depsgraph, Object *ob, b BKE_pose_where_is_bone(depsgraph, NULL, ob, &work_pchan, 0.0f, false); /* find the matrix, need to remove the bone transforms first so this is - * calculated as a matrix to set rather then a difference ontop of whats + * calculated as a matrix to set rather then a difference ontop of what's * already there. */ unit_m4(outmat); BKE_pchan_apply_mat4(&work_pchan, outmat, false); @@ -2010,7 +2010,7 @@ void BKE_pose_rebuild(Main *bmain, Object *ob, bArmature *arm, const bool do_id_ /* synchronize protected layers with proxy */ /* HACK! To preserve 2.7x behavior that you always can pose even locked bones, - * do not do any restauration if this is a COW temp copy! */ + * do not do any restoration if this is a COW temp copy! */ /* Switched back to just NO_MAIN tag, for some reasons (c) using COW tag was working this morning, but not anymore... */ if (ob->proxy != NULL && (ob->id.tag & LIB_TAG_NO_MAIN) == 0) { BKE_object_copy_proxy_drivers(ob, ob->proxy); @@ -2265,7 +2265,7 @@ void BKE_pose_where_is_bone( cob = BKE_constraints_make_evalob(depsgraph, scene, ob, pchan, CONSTRAINT_OBTYPE_BONE); /* Solve PoseChannel's Constraints */ - BKE_constraints_solve(depsgraph, &pchan->constraints, cob, ctime); /* ctime doesnt alter objects */ + BKE_constraints_solve(depsgraph, &pchan->constraints, cob, ctime); /* ctime doesn't alter objects */ /* cleanup after Constraint Solving * - applies matrix back to pchan, and frees temporary struct used diff --git a/source/blender/blenkernel/intern/blender_undo.c b/source/blender/blenkernel/intern/blender_undo.c index 857fc72672c..47e1def2aba 100644 --- a/source/blender/blenkernel/intern/blender_undo.c +++ b/source/blender/blenkernel/intern/blender_undo.c @@ -89,7 +89,7 @@ bool BKE_memfile_undo_decode(MemFileUndoData *mfu, bContext *C) G.fileflags = fileflags; if (success) { - /* important not to update time here, else non keyed tranforms are lost */ + /* important not to update time here, else non keyed transforms are lost */ DEG_on_visible_update(bmain, false); } diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 08f8dd40bc7..e4f89e5bcfb 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -522,7 +522,7 @@ void BKE_brush_gpencil_presets(bContext *C) brush->gpencil_settings->brush_type = GP_BRUSH_TYPE_ERASE; brush->gpencil_settings->eraser_mode = GP_BRUSH_ERASER_STROKE; - /* set defaut brush */ + /* set default brush */ BKE_paint_brush_set(paint, deft); } diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index 08e638e7cb1..d8482bf632b 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -1227,7 +1227,7 @@ static void cloth_update_verts( Object *ob, ClothModifierData *clmd, Mesh *mesh } } -/* Update spring rest lenght, for dynamically deformable cloth */ +/* Update spring rest length, for dynamically deformable cloth */ static void cloth_update_spring_lengths( ClothModifierData *clmd, Mesh *mesh ) { Cloth *cloth = clmd->clothObject; @@ -1555,7 +1555,7 @@ static int cloth_build_springs ( ClothModifierData *clmd, Mesh *mesh ) if (curr_ref->polys == 1) { curr_ref->index = i; } - /* Second poly found for this egde, add bending data. */ + /* Second poly found for this edge, add bending data. */ else if (curr_ref->polys == 2) { spring = curr_ref->spring; @@ -1580,7 +1580,7 @@ static int cloth_build_springs ( ClothModifierData *clmd, Mesh *mesh ) bend_springs++; } - /* Third poly found for this egde, remove bending data. */ + /* Third poly found for this edge, remove bending data. */ else if (curr_ref->polys == 3) { spring = curr_ref->spring; diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index 75f721b79e6..ef126da3463 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -97,7 +97,7 @@ static Collection *collection_add(Main *bmain, Collection *collection_parent, co } /** - * Add a collection to a collection ListBase and syncronize all render layers + * Add a collection to a collection ListBase and synchronize all render layers * The ListBase is NULL when the collection is to be added to the master collection */ Collection *BKE_collection_add(Main *bmain, Collection *collection_parent, const char *name_custom) diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 8632e575813..587a2612997 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -1051,7 +1051,7 @@ makebreak: lines = ct_last->linenr - ct_first->linenr + 1; textbox_scale(&tb_scale, &cu->tb[tb_index], 1.0f / cu->fsize); - /* The initial Y origin of the textbox is harcoded to 1.0f * text scale. */ + /* The initial Y origin of the textbox is hardcoded to 1.0f * text scale. */ const float textbox_y_origin = 1.0f; float yoff; diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c index cf5c58d5727..ed9c6568c95 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier.c +++ b/source/blender/blenkernel/intern/gpencil_modifier.c @@ -583,7 +583,7 @@ void BKE_gpencil_modifier_copyData_generic(const GpencilModifierData *md_src, Gp { const GpencilModifierTypeInfo *mti = BKE_gpencil_modifierType_getInfo(md_src->type); - /* md_dst may have alredy be fully initialized with some extra allocated data, + /* md_dst may have already be fully initialized with some extra allocated data, * we need to free it now to avoid memleak. */ if (mti->freeData) { mti->freeData(md_dst); @@ -731,7 +731,7 @@ void BKE_gpencil_subdivide(bGPDstroke *gps, int level, int flag) temp_points = MEM_dupallocN(gps->points); oldtotpoints = gps->totpoints; - /* resize the points arrys */ + /* resize the points arrays */ gps->totpoints += totnewpoints; gps->points = MEM_recallocN(gps->points, sizeof(*gps->points) * gps->totpoints); if (gps->dvert != NULL) { diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 9486f068c44..a209b2ac1d7 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1437,7 +1437,7 @@ void BKE_libblock_copy_ex(Main *bmain, const ID *id, ID **r_newid, const int fla BLI_assert((flag & LIB_ID_CREATE_NO_MAIN) != 0 || bmain != NULL); BLI_assert((flag & LIB_ID_CREATE_NO_MAIN) != 0 || (flag & LIB_ID_CREATE_NO_ALLOCATE) == 0); BLI_assert((flag & LIB_ID_CREATE_NO_MAIN) == 0 || (flag & LIB_ID_CREATE_NO_USER_REFCOUNT) != 0); - /* Never implicitely copy shapekeys when generating temp data outside of Main database. */ + /* Never implicitly copy shapekeys when generating temp data outside of Main database. */ BLI_assert((flag & LIB_ID_CREATE_NO_MAIN) == 0 || (flag & LIB_ID_COPY_SHAPEKEY) == 0); if ((flag & LIB_ID_CREATE_NO_ALLOCATE) != 0) { diff --git a/source/blender/blenkernel/intern/library_override.c b/source/blender/blenkernel/intern/library_override.c index 150092392b4..35437c1c9b9 100644 --- a/source/blender/blenkernel/intern/library_override.c +++ b/source/blender/blenkernel/intern/library_override.c @@ -169,7 +169,7 @@ static ID *override_static_create_from(Main *bmain, ID *reference_id) } -/** Create an overriden local copy of linked reference. */ +/** Create an overridden local copy of linked reference. */ ID *BKE_override_static_create_from_id(Main *bmain, ID *reference_id) { BLI_assert(reference_id != NULL); @@ -177,13 +177,13 @@ ID *BKE_override_static_create_from_id(Main *bmain, ID *reference_id) ID *local_id = override_static_create_from(bmain, reference_id); - /* Remapping, we obviously only want to affect local data (and not our own reference pointer to overriden ID). */ + /* Remapping, we obviously only want to affect local data (and not our own reference pointer to overridden ID). */ BKE_libblock_remap(bmain, reference_id, local_id, ID_REMAP_SKIP_INDIRECT_USAGE | ID_REMAP_SKIP_STATIC_OVERRIDE); return local_id; } -/** Create overriden local copies of all tagged data-blocks in given Main. +/** Create overridden local copies of all tagged data-blocks in given Main. * * \note Set id->newid of overridden libs with newly created overrides, caller is responsible to clean those pointers * before/after usage as needed. @@ -207,7 +207,7 @@ bool BKE_override_static_create_from_tag(Main *bmain) } } - /* Remapping, we obviously only want to affect local data (and not our own reference pointer to overriden ID). */ + /* Remapping, we obviously only want to affect local data (and not our own reference pointer to overridden ID). */ a = num_types; while (a--) { for (ID *reference_id = lbarray[a]->first; reference_id != NULL; reference_id = reference_id->next) { @@ -236,7 +236,7 @@ IDOverrideStaticProperty *BKE_override_static_property_find(IDOverrideStatic *ov */ IDOverrideStaticProperty *BKE_override_static_property_get(IDOverrideStatic *override, const char *rna_path, bool *r_created) { - /* XXX TODO we'll most likely want a runtime ghash to store taht mapping at some point. */ + /* XXX TODO we'll most likely want a runtime ghash to store that mapping at some point. */ IDOverrideStaticProperty *op = BKE_override_static_property_find(override, rna_path); if (op == NULL) { @@ -587,7 +587,7 @@ void BKE_main_override_static_operations_create(Main *bmain, const bool force_au } } -/** Update given override from its reference (re-applying overriden properties). */ +/** Update given override from its reference (re-applying overridden properties). */ void BKE_override_static_update(Main *bmain, ID *local) { if (local->override_static == NULL || local->override_static->reference == NULL) { @@ -681,7 +681,7 @@ void BKE_main_override_static_update(Main *bmain) * II) We store the differential value into a second 'ghost' data-block, which is an empty ID of same type as local one, * where we only define values that need differential data. * - * This avoids us having to modify 'real' data-block at write time (and retoring it afterwards), which is inneficient, + * This avoids us having to modify 'real' data-block at write time (and restoring it afterwards), which is inneficient, * and potentially dangerous (in case of concurrent access...), while not using much extra memory in typical cases. * It also ensures stored data-block always contains exact same data as "desired" ones (kind of "baked" data-blocks). */ diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index 27f0b653347..2f125beec5f 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -949,7 +949,7 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call bScreen *screen = BKE_workspace_layout_screen_get(layout); /* CALLBACK_INVOKE expects an actual pointer, not a variable holding the pointer. - * However we can't acess layout->screen here since we are outside the workspace project. */ + * However we can't access layout->screen here since we are outside the workspace project. */ CALLBACK_INVOKE(screen, IDWALK_CB_USER); /* allow callback to set a different screen */ BKE_workspace_layout_screen_set(layout, screen); diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 4e070f50a14..c38196bcfb9 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -326,7 +326,7 @@ static void mesh_ensure_tessellation_customdata(Mesh *me) /* note: this warning may be un-called for if we are initializing the mesh for the * first time from bmesh, rather then giving a warning about this we could be smarter * and check if there was any data to begin with, for now just print the warning with - * some info to help troubleshoot whats going on - campbell */ + * some info to help troubleshoot what's going on - campbell */ printf("%s: warning! Tessellation uvs or vcol data got out of sync, " "had to reset!\n CD_MTFACE: %d != CD_MLOOPUV: %d || CD_MCOL: %d != CD_MLOOPCOL: %d\n", __func__, tottex_tessface, tottex_original, totcol_tessface, totcol_original); diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c index f3318e5b57a..7cc7095361c 100644 --- a/source/blender/blenkernel/intern/mesh_convert.c +++ b/source/blender/blenkernel/intern/mesh_convert.c @@ -1330,7 +1330,7 @@ void BKE_mesh_nomain_to_mesh(Mesh *mesh_src, Mesh *mesh_dst, Object *ob, CustomD totedge); } if (!CustomData_has_layer(&tmp.pdata, CD_MPOLY)) { - /* TODO(Sybren): assigment to tmp.mxxx is probably not necessary due to the + /* TODO(Sybren): assignment to tmp.mxxx is probably not necessary due to the * BKE_mesh_update_customdata_pointers() call below. */ tmp.mloop = (alloctype == CD_ASSIGN) ? mesh_src->mloop : MEM_dupallocN(mesh_src->mloop); tmp.mpoly = (alloctype == CD_ASSIGN) ? mesh_src->mpoly : MEM_dupallocN(mesh_src->mpoly); diff --git a/source/blender/blenkernel/intern/mesh_runtime.c b/source/blender/blenkernel/intern/mesh_runtime.c index 51dd9a9ea3a..f52e0addc74 100644 --- a/source/blender/blenkernel/intern/mesh_runtime.c +++ b/source/blender/blenkernel/intern/mesh_runtime.c @@ -244,7 +244,7 @@ static void mesh_runtime_debug_info_layers( for (type = 0; type < CD_NUMTYPES; type++) { if (CustomData_has_layer(cd, type)) { - /* note: doesnt account for multiple layers */ + /* note: doesn't account for multiple layers */ const char *name = CustomData_layertype_name(type); const int size = CustomData_sizeof(type); const void *pt = CustomData_get_layer(cd, type); diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 7462efc268c..1863e454397 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -910,7 +910,7 @@ struct Mesh *modifier_applyModifier_ensure_normals(struct ModifierData *md, cons return mti->applyModifier(md, ctx, mesh); } -/* depricated variants of above that accept DerivedMesh */ +/* deprecated variants of above that accept DerivedMesh */ void modifier_deformVerts_DM_deprecated(struct ModifierData *md, const ModifierEvalContext *ctx, struct DerivedMesh *dm, diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c index 617352840da..9e17d41ed7a 100644 --- a/source/blender/blenkernel/intern/multires_reshape.c +++ b/source/blender/blenkernel/intern/multires_reshape.c @@ -145,7 +145,7 @@ static void multires_reshape_init_mmd_top_level( } /* ============================================================================= - * General reshape implementaiton, reused by all particular cases. + * General reshape implementation, reused by all particular cases. */ typedef struct MultiresReshapeContext { @@ -427,7 +427,7 @@ static void multires_reshape_propagate_prepare( BLI_assert(reshape_level <= top_level); data->old_displacement_grids = NULL; if (reshape_level == top_level) { - /* Nothing to do, reshape will happen on the whole grid conent. */ + /* Nothing to do, reshape will happen on the whole grid content. */ return; } Mesh *coarse_mesh = object->data; diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 1cf019a7e3c..cdf5af66dd6 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2849,7 +2849,7 @@ void BKE_object_handle_update_ex(Depsgraph *depsgraph, /* WARNING: "scene" here may not be the scene object actually resides in. * When dealing with background-sets, "scene" is actually the active scene. * e.g. "scene" <-- set 1 <-- set 2 ("ob" lives here) <-- set 3 <-- ... <-- set n - * rigid bodies depend on their world so use BKE_object_handle_update_ex() to also pass along the corrent rigid body world + * rigid bodies depend on their world so use BKE_object_handle_update_ex() to also pass along the current rigid body world */ void BKE_object_handle_update(Depsgraph *depsgraph, Scene *scene, Object *ob) { diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 79d7deb7e55..8c2f226eb8b 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -934,7 +934,7 @@ Scene *BKE_scene_add(Main *bmain, const char *name) } /** - * Check if there is any intance of the object in the scene + * Check if there is any instance of the object in the scene */ bool BKE_scene_object_find(Scene *scene, Object *ob) { diff --git a/source/blender/blenkernel/intern/shader_fx.c b/source/blender/blenkernel/intern/shader_fx.c index 0bbac9b7a2a..f19b450dece 100644 --- a/source/blender/blenkernel/intern/shader_fx.c +++ b/source/blender/blenkernel/intern/shader_fx.c @@ -165,7 +165,7 @@ void BKE_shaderfx_copyData_generic(const ShaderFxData *fx_src, ShaderFxData *fx_ { const ShaderFxTypeInfo *fxi = BKE_shaderfxType_getInfo(fx_src->type); - /* fx_dst may have alredy be fully initialized with some extra allocated data, + /* fx_dst may have already be fully initialized with some extra allocated data, * we need to free it now to avoid memleak. */ if (fxi->freeData) { fxi->freeData(fx_dst); diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 2c378c17fa4..b3f1cbf6a1f 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -714,7 +714,7 @@ void smokeModifier_copy(const struct SmokeModifierData *smd, struct SmokeModifie #ifdef WITH_SMOKE -// forward decleration +// forward declaration static void smoke_calc_transparency(SmokeDomainSettings *sds, ViewLayer *view_layer); static float calc_voxel_transp(float *result, float *input, int res[3], int *pixel, float *tRay, float correct); diff --git a/source/blender/blenkernel/intern/subdiv_ccg.c b/source/blender/blenkernel/intern/subdiv_ccg.c index c05bf8ad76d..00ac9c49b83 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg.c +++ b/source/blender/blenkernel/intern/subdiv_ccg.c @@ -164,7 +164,7 @@ static void subdiv_ccg_alloc_elements(SubdivCCG *subdiv_ccg, Subdiv *subdiv) subdiv_ccg->grid_hidden[grid_index] = BLI_BITMAP_NEW(grid_area, "ccg grid hidden"); } - /* TOOD(sergey): Allocate memory for loose elements. */ + /* TODO(sergey): Allocate memory for loose elements. */ /* Allocate memory for faces. */ subdiv_ccg->num_faces = num_faces; if (num_faces) { diff --git a/source/blender/blenkernel/intern/subdiv_foreach.c b/source/blender/blenkernel/intern/subdiv_foreach.c index 5c45d7017d3..511536c31b5 100644 --- a/source/blender/blenkernel/intern/subdiv_foreach.c +++ b/source/blender/blenkernel/intern/subdiv_foreach.c @@ -123,7 +123,7 @@ typedef struct SubdivForeachTaskContext { */ BLI_bitmap *coarse_vertices_used_map; /* Bitmap indicating whether edge was used already or not. This includes: - * - During context initialization it indicates whether subdivided verticies + * - During context initialization it indicates whether subdivided vertices * for corresponding edge were already calculated or not. * - During patch evaluation it indicates whether vertices along this edge * were already evaluated. @@ -167,7 +167,7 @@ static void subdiv_foreach_ctx_count(SubdivForeachTaskContext *ctx) ctx->num_subdiv_vertices += num_subdiv_vertices_per_coarse_edge; } } - /* Inner verticies of polygon. */ + /* Inner vertices of polygon. */ if (num_ptex_faces_per_poly == 1) { ctx->num_subdiv_vertices += num_inner_vertices_per_quad; ctx->num_subdiv_edges += @@ -1322,13 +1322,13 @@ static void subdiv_foreach_loops_regular(SubdivForeachTaskContext *ctx, for (int x = 1; x < ptex_resolution - 2; x++, subdiv_loop_index += 4) { const int inner_x = x - 1; const float u = x * inv_ptex_resolution_1; - /* Vertex indicies ordered counter-clockwise. */ + /* Vertex indices ordered counter-clockwise. */ const int v0 = start_vertex_index + (inner_y * ptex_inner_resolution + inner_x); const int v1 = v0 + 1; const int v2 = v0 + ptex_inner_resolution + 1; const int v3 = v0 + ptex_inner_resolution; - /* Edge indicies ordered counter-clockwise. */ + /* Edge indices ordered counter-clockwise. */ const int e0 = start_edge_index + (inner_y * (2 * ptex_inner_resolution - 1) + inner_x); const int e1 = e0 + ptex_inner_resolution; @@ -1517,14 +1517,14 @@ static void subdiv_foreach_loops_special(SubdivForeachTaskContext *ctx, { const int inner_x = x - 1; const float u = x * inv_ptex_resolution_1; - /* Vertex indicies ordered counter-clockwise. */ + /* Vertex indices ordered counter-clockwise. */ const int v0 = corner_vertex_index + (inner_y * (ptex_face_inner_resolution + 1) + inner_x); const int v1 = v0 + 1; const int v2 = v0 + ptex_face_inner_resolution + 2; const int v3 = v0 + ptex_face_inner_resolution + 1; - /* Edge indicies ordered counter-clockwise. */ + /* Edge indices ordered counter-clockwise. */ const int e0 = corner_edge_index + (inner_y * (2 * ptex_face_inner_resolution + 1) + inner_x); const int e1 = e0 + ptex_face_inner_resolution + 1; @@ -1905,7 +1905,7 @@ static void subdiv_foreach_vertices_of_loose_edges_task( const int num_subdiv_vertices_per_coarse_edge = resolution - 2; const Mesh *coarse_mesh = ctx->coarse_mesh; const MEdge *coarse_edge = &coarse_mesh->medge[coarse_edge_index]; - /* Subdivion verticies which corresponds to edge's v1 and v2. */ + /* Subdivion vertices which corresponds to edge's v1 and v2. */ const int subdiv_v1_index = ctx->vertices_corner_offset + coarse_edge->v1; const int subdiv_v2_index = diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c b/source/blender/blenkernel/intern/subdiv_mesh.c index f4c229cb701..d8d4014b3cd 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.c +++ b/source/blender/blenkernel/intern/subdiv_mesh.c @@ -119,7 +119,7 @@ static void loops_of_ptex_get( /* Loop which look in the (opposite) V direction of the current * ptex face. * - * TOOD(sergey): Get rid of using module on every iteration. + * TODO(sergey): Get rid of using module on every iteration. */ const int last_ptex_loop_index = coarse_poly->loopstart + @@ -562,7 +562,7 @@ static void evaluate_vertex_and_apply_displacement_copy( MVert *subdiv_vert) { /* Displacement is accumulated in subdiv vertex position. - * need to back it up before copying data fro original vertex. + * need to back it up before copying data from original vertex. */ float D[3]; copy_v3_v3(D, subdiv_vert->co); @@ -584,7 +584,7 @@ static void evaluate_vertex_and_apply_displacement_interpolate( MVert *subdiv_vert) { /* Displacement is accumulated in subdiv vertex position. - * need to back it up before copying data fro original vertex. + * need to back it up before copying data from original vertex. */ float D[3]; copy_v3_v3(D, subdiv_vert->co); @@ -1073,7 +1073,7 @@ static void setup_foreach_callbacks(SubdivForeachContext *foreach_context, const Subdiv *subdiv) { memset(foreach_context, 0, sizeof(*foreach_context)); - /* General informaiton. */ + /* General information. */ foreach_context->topology_info = subdiv_mesh_topology_info; /* Every boundary geometry. Used for dispalcement averaging. */ if (subdiv->displacement_evaluator != NULL) { -- cgit v1.2.3