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 ++++---- source/blender/collada/ControllerExporter.cpp | 2 +- source/blender/collada/MeshImporter.cpp | 2 +- .../depsgraph/intern/builder/deg_builder_relations_rig.cc | 2 +- source/blender/depsgraph/intern/depsgraph_query_iter.cc | 2 +- .../blender/depsgraph/intern/eval/deg_eval_copy_on_write.h | 2 +- source/blender/gpu/GPU_context.h | 2 +- source/blender/gpu/GPU_immediate_util.h | 2 +- source/blender/gpu/GPU_shader.h | 6 +++--- source/blender/gpu/GPU_viewport.h | 2 +- source/blender/gpu/intern/gpu_buffers.c | 2 +- source/blender/gpu/intern/gpu_codegen.c | 2 +- source/blender/gpu/intern/gpu_context_private.h | 2 +- source/blender/gpu/intern/gpu_framebuffer.c | 2 +- source/blender/gpu/intern/gpu_material.c | 8 ++++---- source/blender/gpu/intern/gpu_texture.c | 4 ++-- source/blender/gpu/intern/gpu_uniformbuffer.c | 2 +- source/blender/gpu/intern/gpu_vertex_buffer.c | 2 +- source/blender/gpu/intern/gpu_viewport.c | 2 +- .../gpu/shaders/gpu_shader_instance_camera_vert.glsl | 2 +- .../shaders/gpu_shader_instance_distance_line_vert.glsl | 2 +- ...pu_shader_instance_objectspace_variying_color_vert.glsl | 2 +- .../shaders/gpu_shader_instance_screen_aligned_vert.glsl | 2 +- ...pu_shader_instance_screenspace_variying_color_vert.glsl | 2 +- ..._shader_instance_variying_size_variying_color_vert.glsl | 2 +- ...gpu_shader_instance_variying_size_variying_id_vert.glsl | 2 +- source/blender/gpu/shaders/gpu_shader_instance_vert.glsl | 2 +- source/blender/gpu/shaders/gpu_shader_material.glsl | 2 +- source/blender/makesdna/DNA_ID.h | 2 +- source/blender/makesdna/DNA_brush_types.h | 2 +- source/blender/makesdna/DNA_gpencil_types.h | 4 ++-- source/blender/makesdna/DNA_object_types.h | 2 +- source/blender/makesdna/DNA_view3d_types.h | 6 +++--- source/blender/makesdna/DNA_workspace_types.h | 2 +- source/blender/makesrna/RNA_types.h | 2 +- source/blender/makesrna/intern/rna_access.c | 6 +++--- source/blender/makesrna/intern/rna_gpencil_modifier.c | 4 ++-- source/blender/makesrna/intern/rna_lightprobe.c | 2 +- source/blender/makesrna/intern/rna_main_api.c | 2 +- source/blender/makesrna/intern/rna_object_api.c | 2 +- source/blender/makesrna/intern/rna_particle.c | 2 +- source/blender/makesrna/intern/rna_rna.c | 8 ++++---- source/blender/makesrna/intern/rna_scene.c | 6 +++--- source/blender/makesrna/intern/rna_shader_fx.c | 2 +- source/blender/windowmanager/gizmo/intern/wm_gizmo.c | 4 ++-- source/blender/windowmanager/intern/wm_draw.c | 2 +- source/blender/windowmanager/intern/wm_event_system.c | 2 +- source/blender/windowmanager/intern/wm_files.c | 2 +- source/blender/windowmanager/intern/wm_stereo.c | 2 +- source/blender/windowmanager/intern/wm_window.c | 2 +- source/blender/windowmanager/wm_event_system.h | 2 +- 77 files changed, 116 insertions(+), 116 deletions(-) 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) { diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp index 4de26639519..cb8903200f1 100644 --- a/source/blender/collada/ControllerExporter.cpp +++ b/source/blender/collada/ControllerExporter.cpp @@ -546,7 +546,7 @@ std::string ControllerExporter::add_inv_bind_mats_source(Object *ob_arm, ListBas } } - // back from rest positon + // back from rest position if (!(flag & ARM_RESTPOS)) { arm->flag = flag; BKE_pose_where_is(depsgraph, scene, ob_arm); diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index 31bf690cb0d..4c0c13db72c 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -1092,7 +1092,7 @@ Object *MeshImporter::create_mesh_object(COLLADAFW::Node *node, COLLADAFW::Insta // add object Object *ob = bc_add_object(m_bmain, scene, view_layer, OB_MESH, name); - bc_set_mark(ob); // used later for material assignement optimization + bc_set_mark(ob); // used later for material assignment optimization // store object pointer for ArmatureImporter diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc index 811986ea0e8..da063b35139 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc @@ -405,7 +405,7 @@ void DepsgraphRelationBuilder::build_rig(Object *object) OperationKey parent_key(&object->id, DEG_NODE_TYPE_BONE, pchan->parent->name, parent_key_opcode); add_relation(parent_key, bone_pose_key, "Parent Bone -> Child Bone"); } - /* Buil constraints. */ + /* Build constraints. */ if (pchan->constraints.first != NULL) { /* Build relations for indirectly linked objects. */ BuilderWalkUserData data; diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc index ac3122d2159..8bba92c262c 100644 --- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc +++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc @@ -93,7 +93,7 @@ void verify_id_properties_freed(DEGObjectIterData *data) const Object *dupli_object = data->dupli_object_current->ob; Object *temp_dupli_object = &data->temp_dupli_object; if (temp_dupli_object->id.properties == NULL) { - // No ID proeprties in temp datablock -- no leak is possible. + // No ID properties in temp datablock -- no leak is possible. return; } if (temp_dupli_object->id.properties == dupli_object->id.properties) { diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h index 40b1f94c7bc..e9f5bc1e918 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.h @@ -83,7 +83,7 @@ void deg_free_copy_on_write_datablock(struct ID *id_cow); void deg_evaluate_copy_on_write(struct ::Depsgraph *depsgraph, const struct IDDepsNode *id_node); -/* Check that given ID is propely expanded and does not have any shallow +/* Check that given ID is properly expanded and does not have any shallow * copies inside. */ bool deg_validate_copy_on_write_datablock(ID *id_cow); diff --git a/source/blender/gpu/GPU_context.h b/source/blender/gpu/GPU_context.h index 3e32b64b281..4d667a02fac 100644 --- a/source/blender/gpu/GPU_context.h +++ b/source/blender/gpu/GPU_context.h @@ -26,7 +26,7 @@ /** \file blender/gpu/GPU_context.h * \ingroup gpu * - * This interface allow GPU to manage VAOs for mutiple context and threads. + * This interface allow GPU to manage VAOs for multiple context and threads. */ #ifndef __GPU_CONTEXT_H__ diff --git a/source/blender/gpu/GPU_immediate_util.h b/source/blender/gpu/GPU_immediate_util.h index 9f1d9646246..7baf359c52e 100644 --- a/source/blender/gpu/GPU_immediate_util.h +++ b/source/blender/gpu/GPU_immediate_util.h @@ -28,7 +28,7 @@ #define __GPU_IMMEDIATE_UTIL_H__ /* Draw 2D rectangles (replaces glRect functions) */ -/* caller is reponsible for vertex format & shader */ +/* caller is responsible for vertex format & shader */ void immRectf(uint pos, float x1, float y1, float x2, float y2); void immRecti(uint pos, int x1, int y1, int x2, int y2); diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h index d14164e930e..1a1d40b32c2 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.h @@ -73,7 +73,7 @@ void GPU_shader_free(GPUShader *shader); void GPU_shader_bind(GPUShader *shader); void GPU_shader_unbind(void); -/* Returns true if transform feedback was succesfully enabled. */ +/* Returns true if transform feedback was successfully enabled. */ bool GPU_shader_transform_feedback_enable(GPUShader *shader, unsigned int vbo_id); void GPU_shader_transform_feedback_disable(GPUShader *shader); @@ -197,7 +197,7 @@ typedef enum GPUBuiltinShader { GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR, GPU_SHADER_2D_IMAGE_MASK_UNIFORM_COLOR, /** - * Draw texture with alpha. Take a 3D positon and a 2D texture coordinate for each vertex. + * Draw texture with alpha. Take a 3D position and a 2D texture coordinate for each vertex. * * \param alpha: uniform float * \param image: uniform sampler2D @@ -207,7 +207,7 @@ typedef enum GPUBuiltinShader { GPU_SHADER_3D_IMAGE_MODULATE_ALPHA, /** * Draw linearized depth texture relate to near and far distances. - * Take a 3D positon and a 2D texture coordinate for each vertex. + * Take a 3D position and a 2D texture coordinate for each vertex. * * \param znear: uniform float * \param zfar: uniform float diff --git a/source/blender/gpu/GPU_viewport.h b/source/blender/gpu/GPU_viewport.h index 921cd0e7369..45712050b73 100644 --- a/source/blender/gpu/GPU_viewport.h +++ b/source/blender/gpu/GPU_viewport.h @@ -43,7 +43,7 @@ typedef struct GPUViewport GPUViewport; -/* Contains memory pools informations */ +/* Contains memory pools information */ typedef struct ViewportMemoryPool { struct BLI_mempool *calls; struct BLI_mempool *states; diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 5d34cdbb6fb..38edcbe7f71 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -413,7 +413,7 @@ void GPU_pbvh_grid_buffers_update( GPU_INDEXBUF_DISCARD_SAFE(buffers->index_buf_fast); } else if (!buffers->smooth && buffers->index_buf != NULL) { - /* Discard unecessary index buffers. */ + /* Discard unnecessary index buffers. */ GPU_BATCH_DISCARD_SAFE(buffers->triangles); GPU_BATCH_DISCARD_SAFE(buffers->triangles_fast); GPU_INDEXBUF_DISCARD_SAFE(buffers->index_buf); diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index 69801f64ab1..c1e6b9b53a0 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -873,7 +873,7 @@ static char *code_generate_vertex(ListBase *nodes, const char *vert_code, bool u /* XXX FIXME : see notes in mesh_render_data_create() */ /* NOTE : Replicate changes to mesh_render_data_create() in draw_cache_impl_mesh.c */ if (input->attribtype == CD_ORCO) { - /* orco is computed from local positions, see bellow */ + /* orco is computed from local positions, see below */ BLI_dynstr_appendf(ds, "uniform vec3 OrcoTexCoFactors[2];\n"); } else if (input->attribname[0] == '\0') { diff --git a/source/blender/gpu/intern/gpu_context_private.h b/source/blender/gpu/intern/gpu_context_private.h index 762d9ff10c0..7f13dd542da 100644 --- a/source/blender/gpu/intern/gpu_context_private.h +++ b/source/blender/gpu/intern/gpu_context_private.h @@ -26,7 +26,7 @@ /** \file blender/gpu/intern/gpu_context_private.h * \ingroup gpu * - * This interface allow GPU to manage GL objects for mutiple context and threads. + * This interface allow GPU to manage GL objects for multiple context and threads. */ #ifndef __GPU_CONTEXT_PRIVATE_H__ diff --git a/source/blender/gpu/intern/gpu_framebuffer.c b/source/blender/gpu/intern/gpu_framebuffer.c index 270dc014f7b..346d1320b75 100644 --- a/source/blender/gpu/intern/gpu_framebuffer.c +++ b/source/blender/gpu/intern/gpu_framebuffer.c @@ -75,7 +75,7 @@ struct GPUFrameBuffer { int width, height; bool multisample; /* TODO Check that we always use the right context when binding - * (FBOs are not shared accross ogl contexts). */ + * (FBOs are not shared across ogl contexts). */ // void *ctx; }; diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index d5aa7177e11..ac97867f40f 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -67,7 +67,7 @@ typedef struct GPUColorBandBuilder { } GPUColorBandBuilder; struct GPUMaterial { - Scene *scene; /* DEPRECATED was only usefull for lamps */ + Scene *scene; /* DEPRECATED was only useful for lamps */ Material *ma; /* material for mesh surface, worlds or something else. @@ -141,7 +141,7 @@ enum { /* Functions */ -/* Returns the adress of the future pointer to coba_tex */ +/* Returns the address of the future pointer to coba_tex */ GPUTexture **gpu_material_ramp_texture_row_set(GPUMaterial *mat, int size, float *pixels, float *row) { /* In order to put all the colorbands into one 1D array texture, @@ -467,7 +467,7 @@ static void compute_sss_translucence_kernel( /* Distance from surface. */ float d = kd->max_radius * ((float)i + 0.00001f) / ((float)resolution); - /* For each distance d we compute the radiance incomming from an hypothetic parallel plane. */ + /* For each distance d we compute the radiance incoming from an hypothetic parallel plane. */ /* Compute radius of the footprint on the hypothetic plane */ float r_fp = sqrtf(kd->max_radius * kd->max_radius - d * d); float r_step = r_fp / INTEGRAL_RESOLUTION; @@ -482,7 +482,7 @@ static void compute_sss_translucence_kernel( profile[1] = eval_profile(dist, falloff_type, sharpness, kd->param[1]); profile[2] = eval_profile(dist, falloff_type, sharpness, kd->param[2]); - /* Since the profile and configuration are radially symetrical we + /* Since the profile and configuration are radially symmetrical we * can just evaluate it once and weight it accordingly */ float r_next = r + r_step; float disk_area = (M_PI * r_next * r_next) - (M_PI * r * r); diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c index 0ef1700b348..abb632ce718 100644 --- a/source/blender/gpu/intern/gpu_texture.c +++ b/source/blender/gpu/intern/gpu_texture.c @@ -764,7 +764,7 @@ GPUTexture *GPU_texture_create_buffer(GPUTextureFormat tex_format, const GLuint if (!tex->bindcode) { fprintf(stderr, "GPUTexture: texture create failed\n"); GPU_texture_free(tex); - BLI_assert(0 && "glGenTextures failled: Are you sure a valid OGL context is active on this thread?\n"); + BLI_assert(0 && "glGenTextures failed: Are you sure a valid OGL context is active on this thread?\n"); return NULL; } @@ -1441,7 +1441,7 @@ int GPU_texture_detach_framebuffer(GPUTexture *tex, GPUFrameBuffer *fb) void GPU_texture_get_mipmap_size(GPUTexture *tex, int lvl, int *size) { - /* TODO assert if lvl is bellow the limit of 1px in each dimension. */ + /* TODO assert if lvl is below the limit of 1px in each dimension. */ int div = 1 << lvl; size[0] = max_ii(1, tex->w / div); diff --git a/source/blender/gpu/intern/gpu_uniformbuffer.c b/source/blender/gpu/intern/gpu_uniformbuffer.c index 82b82d622a4..9bc3727bb03 100644 --- a/source/blender/gpu/intern/gpu_uniformbuffer.c +++ b/source/blender/gpu/intern/gpu_uniformbuffer.c @@ -291,7 +291,7 @@ static void gpu_uniformbuffer_inputs_sort(ListBase *inputs) while (link != NULL && ((GPUInput *)link->data)->type == GPU_VEC3) { LinkData *link_next = link->next; - /* If GPU_VEC3 is followed by nothing or a GPU_FLOAT, no need for aligment. */ + /* If GPU_VEC3 is followed by nothing or a GPU_FLOAT, no need for alignment. */ if ((link_next == NULL) || ((GPUInput *)link_next->data)->type == GPU_FLOAT) { diff --git a/source/blender/gpu/intern/gpu_vertex_buffer.c b/source/blender/gpu/intern/gpu_vertex_buffer.c index 05100b8a23f..b6058a2cb79 100644 --- a/source/blender/gpu/intern/gpu_vertex_buffer.c +++ b/source/blender/gpu/intern/gpu_vertex_buffer.c @@ -155,7 +155,7 @@ void GPU_vertbuf_data_resize(GPUVertBuf *verts, uint v_len) /* Set vertex count but does not change allocation. * Only this many verts will be uploaded to the GPU and rendered. - * This is usefull for streaming data. */ + * This is useful for streaming data. */ void GPU_vertbuf_vertex_count_set(GPUVertBuf *verts, uint v_len) { #if TRUST_NO_ONE diff --git a/source/blender/gpu/intern/gpu_viewport.c b/source/blender/gpu/intern/gpu_viewport.c index fe98477f28c..1dd3faa3b03 100644 --- a/source/blender/gpu/intern/gpu_viewport.c +++ b/source/blender/gpu/intern/gpu_viewport.c @@ -288,7 +288,7 @@ double *GPU_viewport_cache_time_get(GPUViewport *viewport) } /** - * Try to find a texture coresponding to params into the texture pool. + * Try to find a texture corresponding to params into the texture pool. * If no texture was found, create one and add it to the pool. */ GPUTexture *GPU_viewport_texture_pool_query(GPUViewport *viewport, void *engine, int width, int height, int format) diff --git a/source/blender/gpu/shaders/gpu_shader_instance_camera_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_camera_vert.glsl index aec8fd9b0a1..805ecd6085f 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_camera_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_camera_vert.glsl @@ -1,7 +1,7 @@ uniform mat4 ViewProjectionMatrix; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in float pos; /* ---- Per instance Attribs ---- */ diff --git a/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl index ced5bb7f684..255eeb9baf1 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_distance_line_vert.glsl @@ -1,7 +1,7 @@ uniform mat4 ViewProjectionMatrix; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in vec3 pos; /* ---- Per instance Attribs ---- */ diff --git a/source/blender/gpu/shaders/gpu_shader_instance_objectspace_variying_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_objectspace_variying_color_vert.glsl index 9876717b297..d2b64608eaa 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_objectspace_variying_color_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_objectspace_variying_color_vert.glsl @@ -2,7 +2,7 @@ uniform mat4 ViewMatrix; uniform mat4 ViewProjectionMatrix; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in vec3 pos; in vec3 nor; diff --git a/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_vert.glsl index 2ee74b3eae0..429b648ca53 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_screen_aligned_vert.glsl @@ -2,7 +2,7 @@ uniform mat4 ViewProjectionMatrix; uniform vec3 screen_vecs[2]; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in vec3 pos; /* using Z as axis id */ /* ---- Per instance Attribs ---- */ diff --git a/source/blender/gpu/shaders/gpu_shader_instance_screenspace_variying_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_screenspace_variying_color_vert.glsl index ba0ac29fb79..2a4675ce2c9 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_screenspace_variying_color_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_screenspace_variying_color_vert.glsl @@ -4,7 +4,7 @@ uniform vec3 screen_vecs[2]; uniform float size; uniform float pixel_size; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in vec2 pos; /* ---- Per instance Attribs ---- */ diff --git a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl index 1c49d9dec3e..1ec158ae15c 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_color_vert.glsl @@ -2,7 +2,7 @@ uniform mat4 ViewProjectionMatrix; uniform float alpha; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in vec3 pos; /* ---- Per instance Attribs ---- */ diff --git a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_id_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_id_vert.glsl index 49750dddb3c..f265bf9fc01 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_id_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_variying_size_variying_id_vert.glsl @@ -2,7 +2,7 @@ uniform mat4 ViewProjectionMatrix; uniform int baseId; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in vec3 pos; /* ---- Per instance Attribs ---- */ diff --git a/source/blender/gpu/shaders/gpu_shader_instance_vert.glsl b/source/blender/gpu/shaders/gpu_shader_instance_vert.glsl index eac167e8045..a4facae435e 100644 --- a/source/blender/gpu/shaders/gpu_shader_instance_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_instance_vert.glsl @@ -1,7 +1,7 @@ uniform mat4 ViewProjectionMatrix; -/* ---- Instanciated Attribs ---- */ +/* ---- Instantiated Attribs ---- */ in vec3 pos; /* ---- Per instance Attribs ---- */ diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl index 8fa1828bd9c..64f04e5b1fe 100644 --- a/source/blender/gpu/shaders/gpu_shader_material.glsl +++ b/source/blender/gpu/shaders/gpu_shader_material.glsl @@ -1375,7 +1375,7 @@ void node_subsurface_scattering( eevee_closure_subsurface(N, color.rgb, 1.0, scale, out_diff, out_trans); result.sss_data.rgb = out_diff + out_trans; # ifdef USE_SSS_ALBEDO - /* Not perfect for texture_blur not exaclty equal to 0.0 or 1.0. */ + /* Not perfect for texture_blur not exactly equal to 0.0 or 1.0. */ result.sss_albedo.rgb = mix(color.rgb, vec3(1.0), texture_blur); result.sss_data.rgb *= mix(vec3(1.0), color.rgb, texture_blur); # else diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 4e5f76a6b72..9e5e822c4d5 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -187,7 +187,7 @@ enum { IDOVERRIDESTATIC_FLAG_LOCKED = 1 << 1, /* User cannot change that override operation. */ }; -/* A single overriden property, contain all operations on this one. */ +/* A single overridden property, contain all operations on this one. */ typedef struct IDOverrideStaticProperty { struct IDOverrideStaticProperty *next, *prev; diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index 970605d6be7..6c382dcbcab 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -55,7 +55,7 @@ typedef struct BrushClone { typedef struct BrushGpencilSettings { float draw_smoothfac; /* amount of smoothing to apply to newly created strokes */ - float draw_sensitivity; /* amount of sensivity to apply to newly created strokes */ + float draw_sensitivity; /* amount of sensitivity to apply to newly created strokes */ float draw_strength; /* amount of alpha strength to apply to newly created strokes */ float draw_jitter; /* amount of jitter to apply to newly created strokes */ float draw_angle; /* angle when the brush has full thickness */ diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 2127e629ff8..b1cf1f6db80 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -76,14 +76,14 @@ typedef enum eGPDspoint_Flag { } eGPSPoint_Flag; /* ***************************************** */ -/* GP Fill - Triangle Tesselation Data */ +/* GP Fill - Triangle Tessellation Data */ /* Grease-Pencil Annotations - 'Triangle' * -> A triangle contains the index of three vertices for filling the stroke * This is only used if high quality fill is enabled */ typedef struct bGPDtriangle { - /* indices for tesselated triangle used for GP Fill */ + /* indices for tessellated triangle used for GP Fill */ unsigned int verts[3]; /* texture coordinates for verts */ float uv[3][2]; diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index a000a083ff6..b988ca9801a 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -292,7 +292,7 @@ typedef struct Object { struct RigidBodyCon *rigidbody_constraint; /* settings for Bullet constraint */ float ima_ofs[2]; /* offset for image empties */ - ImageUser *iuser; /* must be non-null when oject is an empty image */ + ImageUser *iuser; /* must be non-null when object is an empty image */ ListBase lodlevels; /* contains data for levels of detail */ LodLevel *currentlod; diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h index 5574ab3a6a1..7620d674b1e 100644 --- a/source/blender/makesdna/DNA_view3d_types.h +++ b/source/blender/makesdna/DNA_view3d_types.h @@ -133,7 +133,7 @@ typedef struct View3DCursor { char _pad[4]; } View3DCursor; -/* 3D Viewport Shading setings */ +/* 3D Viewport Shading settings */ typedef struct View3DShading { short type; /* Shading type (VIEW3D_SHADE_SOLID, ..) */ short prev_type; /* Runtime, for toggle between rendered viewport. */ @@ -165,7 +165,7 @@ typedef struct View3DShading { } View3DShading; -/* 3D Viewport Overlay setings */ +/* 3D Viewport Overlay settings */ typedef struct View3DOverlay { int flag; @@ -190,7 +190,7 @@ typedef struct View3DOverlay { float wireframe_threshold; char _pad0[4]; - /* grease pencil setttings */ + /* grease pencil settings */ float gpencil_grid_scale; float gpencil_paper_opacity; int gpencil_grid_lines; diff --git a/source/blender/makesdna/DNA_workspace_types.h b/source/blender/makesdna/DNA_workspace_types.h index 296fa8a713c..7f14dc448e2 100644 --- a/source/blender/makesdna/DNA_workspace_types.h +++ b/source/blender/makesdna/DNA_workspace_types.h @@ -195,7 +195,7 @@ typedef struct WorkSpaceDataRelation { #endif /* DNA_PRIVATE_WORKSPACE_READ_WRITE */ /** - * Little wrapper to store data that is going to be per window, but comming from the workspace. + * Little wrapper to store data that is going to be per window, but coming from the workspace. * It allows us to keep workspace and window data completely separate. */ typedef struct WorkSpaceInstanceHook { diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index 7ad20fa65d3..f71969d0307 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -247,7 +247,7 @@ typedef enum PropertyFlag { /* Flags related to comparing and overriding RNA properties. Make sure enums are updated with these */ /* FREE FLAGS: 2, 3, 4, 5, 6, 7, 8, 9, 12 and above. */ typedef enum PropertyOverrideFlag { - /* Means the property can be overriden by a local 'proxy' of some linked datablock. */ + /* Means the property can be overridden by a local 'proxy' of some linked datablock. */ PROPOVERRIDE_OVERRIDABLE_STATIC = (1 << 0), /* Forbid usage of this property in comparison (& hence override) code. diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index a0c34afa7ed..bd0b3e9d760 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -7516,13 +7516,13 @@ static bool rna_property_override_operation_apply( } if (ELEM(override_op, IDOVERRIDESTATIC_OP_ADD, IDOVERRIDESTATIC_OP_SUBTRACT, IDOVERRIDESTATIC_OP_MULTIPLY) && !ptr_storage) { - /* We cannot apply 'diff' override operations without some refference storage. + /* We cannot apply 'diff' override operations without some reference storage. * This should typically only happen at read time of .blend file... */ return false; } if (ELEM(override_op, IDOVERRIDESTATIC_OP_ADD, IDOVERRIDESTATIC_OP_SUBTRACT, IDOVERRIDESTATIC_OP_MULTIPLY) && !prop_storage) { - /* We cannot apply 'diff' override operations without some refference storage. + /* We cannot apply 'diff' override operations without some reference storage. * This should typically only happen at read time of .blend file... */ return false; } @@ -7582,7 +7582,7 @@ static bool rna_property_override_operation_apply( } /** - * Check whether reference and local overriden data match (are the same), + * Check whether reference and local overridden data match (are the same), * with respect to given restrictive sets of properties. * If requested, will generate needed new property overrides, and/or restore values from reference. * diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c index ec8adeaddda..b7093d50d51 100644 --- a/source/blender/makesrna/intern/rna_gpencil_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c @@ -654,7 +654,7 @@ static void rna_def_modifier_gpenciloffset(BlenderRNA *brna) prop = RNA_def_property(srna, "rotation", PROP_FLOAT, PROP_EULER); RNA_def_property_float_sdna(prop, NULL, "rot"); - RNA_def_property_ui_text(prop, "Rotation", "Values for chages in rotation"); + RNA_def_property_ui_text(prop, "Rotation", "Values for changes in rotation"); RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); @@ -891,7 +891,7 @@ static void rna_def_modifier_gpencilinstance(BlenderRNA *brna) prop = RNA_def_property(srna, "rotation", PROP_FLOAT, PROP_EULER); RNA_def_property_float_sdna(prop, NULL, "rot"); - RNA_def_property_ui_text(prop, "Rotation", "Value for chages in rotation"); + RNA_def_property_ui_text(prop, "Rotation", "Value for changes in rotation"); RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); diff --git a/source/blender/makesrna/intern/rna_lightprobe.c b/source/blender/makesrna/intern/rna_lightprobe.c index cae06b5aa89..87d457a9048 100644 --- a/source/blender/makesrna/intern/rna_lightprobe.c +++ b/source/blender/makesrna/intern/rna_lightprobe.c @@ -215,7 +215,7 @@ static void rna_def_lightprobe(BlenderRNA *brna) /* Data preview */ prop = RNA_def_property(srna, "show_data", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIGHTPROBE_FLAG_SHOW_DATA); - RNA_def_property_ui_text(prop, "Show Data", "Show captured lighting data into the 3D view for debuging purpose"); + RNA_def_property_ui_text(prop, "Show Data", "Show captured lighting data into the 3D view for debugging purpose"); RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING, NULL); /* common */ diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 6e68eb51ff8..3f486b0e477 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -887,7 +887,7 @@ void RNA_def_main_meshes(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new_from_object", "rna_Main_meshes_new_from_object"); RNA_def_function_ui_description(func, "Add a new mesh created from object with modifiers applied"); RNA_def_function_flag(func, FUNC_USE_REPORTS); - parm = RNA_def_pointer(func, "depsgraph", "Depsgraph", "Dependency Graph", "Evaluated dependency graph within wich to evaluate modifiers"); + parm = RNA_def_pointer(func, "depsgraph", "Depsgraph", "Dependency Graph", "Evaluated dependency graph within which to evaluate modifiers"); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); parm = RNA_def_pointer(func, "object", "Object", "", "Object to create mesh from"); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 1a6c51cccca..b5e3ce4fd28 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -590,7 +590,7 @@ void RNA_api_object(StructRNA *srna) func = RNA_def_function(srna, "to_mesh", "rna_Object_to_mesh"); RNA_def_function_ui_description(func, "Create a Mesh data-block with modifiers applied"); RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_CONTEXT); - parm = RNA_def_pointer(func, "depsgraph", "Depsgraph", "Dependency Graph", "Evaluated dependency graph within wich to evaluate modifiers"); + parm = RNA_def_pointer(func, "depsgraph", "Depsgraph", "Dependency Graph", "Evaluated dependency graph within which to evaluate modifiers"); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); parm = RNA_def_boolean(func, "apply_modifiers", 0, "", "Apply modifiers"); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 49678664ef4..1abba3979f0 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -2331,7 +2331,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "use_group_count", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "draw", PART_DRAW_COUNT_GR); - RNA_def_property_ui_text(prop, "Use Count", "Use object multiple times in the same collecton"); + RNA_def_property_ui_text(prop, "Use Count", "Use object multiple times in the same collection"); RNA_def_property_update(prop, 0, "rna_Particle_redo_count"); prop = RNA_def_property(srna, "use_global_dupli", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index 068f71c4080..cb2ef85d713 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -1333,7 +1333,7 @@ int rna_property_override_diff_default( } } else { - /* Already overriden prop, we'll have to check arrays items etc. */ + /* Already overridden prop, we'll have to check arrays items etc. */ } } @@ -1391,7 +1391,7 @@ int rna_property_override_diff_default( } } else { - /* Already overriden prop, we'll have to check arrays items etc. */ + /* Already overridden prop, we'll have to check arrays items etc. */ } } @@ -1450,7 +1450,7 @@ int rna_property_override_diff_default( } } else { - /* Already overriden prop, we'll have to check arrays items etc. */ + /* Already overridden prop, we'll have to check arrays items etc. */ } } @@ -1788,7 +1788,7 @@ bool rna_property_override_store_default( } /* XXX TODO About range limits. - * Ideally, it woudl be great to get rid of RNA range in that specific case. + * Ideally, it would be great to get rid of RNA range in that specific case. * However, this won't be that easy and will add yet another layer of complexity in generated code, * not to mention that we could most likely *not* bypass custom setters anyway. * So for now, if needed second operand value is not in valid range, we simply fall back diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 166f0b4dd0f..2c457aaaa60 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -3840,7 +3840,7 @@ static void rna_def_gpu_dof_fx(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_GPUDOFSettings_update"); prop = RNA_def_property(srna, "rotation", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_ui_text(prop, "Rotation", "Rotation of blades in apperture"); + RNA_def_property_ui_text(prop, "Rotation", "Rotation of blades in aperture"); RNA_def_property_range(prop, -M_PI, M_PI); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); @@ -5658,7 +5658,7 @@ static void rna_def_scene_eevee(BlenderRNA *brna) prop = RNA_def_property(srna, "use_sss_separate_albedo", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SCE_EEVEE_SSS_SEPARATE_ALBEDO); RNA_def_property_boolean_default(prop, 0); - RNA_def_property_ui_text(prop, "Separate Albedo", "Avoid albedo being blured by the subsurface scattering " + RNA_def_property_ui_text(prop, "Separate Albedo", "Avoid albedo being blurred by the subsurface scattering " "but uses more video memory"); RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC); @@ -5840,7 +5840,7 @@ static void rna_def_scene_eevee(BlenderRNA *brna) prop = RNA_def_property(srna, "use_bloom", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SCE_EEVEE_BLOOM_ENABLED); RNA_def_property_boolean_default(prop, 0); - RNA_def_property_ui_text(prop, "Bloom", "High brighness pixels generate a glowing effect"); + RNA_def_property_ui_text(prop, "Bloom", "High brightness pixels generate a glowing effect"); RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC); prop = RNA_def_property(srna, "bloom_threshold", PROP_FLOAT, PROP_FACTOR); diff --git a/source/blender/makesrna/intern/rna_shader_fx.c b/source/blender/makesrna/intern/rna_shader_fx.c index 4b77e504a38..2c09cfa787e 100644 --- a/source/blender/makesrna/intern/rna_shader_fx.c +++ b/source/blender/makesrna/intern/rna_shader_fx.c @@ -250,7 +250,7 @@ static void rna_def_shader_fx_colorize(BlenderRNA *brna) RNA_def_property_range(prop, 0.0, 1.0); RNA_def_property_float_sdna(prop, NULL, "high_color"); RNA_def_property_array(prop, 4); - RNA_def_property_ui_text(prop, "Hight color", "Second color used for effect"); + RNA_def_property_ui_text(prop, "Height color", "Second color used for effect"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_ShaderFx_update"); prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE); diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo.c index 14deb0be725..6abc37a893f 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo.c @@ -627,7 +627,7 @@ void WM_gizmo_calc_matrix_final(const wmGizmo *gz, float r_mat[4][4]) ); } -/** \name Gizmo Propery Access +/** \name Gizmo Property Access * * Matches `WM_operator_properties` conventions. * @@ -700,7 +700,7 @@ void WM_gizmo_properties_sanitize(PointerRNA *ptr, const bool no_context) /** set all props to their default, * \param do_update Only update un-initialized props. * - * \note, theres nothing specific to gizmos here. + * \note, there's nothing specific to gizmos here. * this could be made a general function. */ bool WM_gizmo_properties_default(PointerRNA *ptr, const bool do_update) diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index c869ec90469..b76fc0abfa7 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -553,7 +553,7 @@ static void wm_draw_window_offscreen(bContext *C, wmWindow *win, bool stereo) CTX_wm_menu_set(C, ar); if (ar->type && ar->type->layout) { - /* UI code reads the OpenGL state, but we have to refesh + /* UI code reads the OpenGL state, but we have to refresh * the UI layout beforehand in case the menu size changes. */ wmViewport(&ar->winrct); ar->type->layout(C, ar); diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index f013a0889cf..a51eb3a529c 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2882,7 +2882,7 @@ void wm_event_do_handlers(bContext *C) bScreen *screen = WM_window_get_active_screen(win); wmEvent *event; - /* some safty checks - these should always be set! */ + /* some safety checks - these should always be set! */ BLI_assert(WM_window_get_active_scene(win)); BLI_assert(WM_window_get_active_screen(win)); BLI_assert(WM_window_get_active_workspace(win)); diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index f461fdc1a63..24883ee9d7d 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -1221,7 +1221,7 @@ static int wm_file_write(bContext *C, const char *filepath, int fileflags, Repor /* blend file thumbnail */ /* save before exit_editmode, otherwise derivedmeshes for shared data corrupt #27765) */ - /* Main now can store a .blend thumbnail, usefull for background mode or thumbnail customization. */ + /* Main now can store a .blend thumbnail, useful for background mode or thumbnail customization. */ main_thumb = thumb = bmain->blen_thumb; if ((U.flag & USER_SAVE_PREVIEWS) && BLI_thread_is_main()) { ibuf_thumb = blend_file_thumb(C, CTX_data_scene(C), CTX_wm_screen(C), &thumb); diff --git a/source/blender/windowmanager/intern/wm_stereo.c b/source/blender/windowmanager/intern/wm_stereo.c index 577145aff95..aa85dbc04b4 100644 --- a/source/blender/windowmanager/intern/wm_stereo.c +++ b/source/blender/windowmanager/intern/wm_stereo.c @@ -403,7 +403,7 @@ int wm_stereo3d_set_exec(bContext *C, wmOperator *op) if (prev_display_mode == S3D_DISPLAY_PAGEFLIP && prev_display_mode != win_src->stereo3d_format->display_mode) { - /* in case the hardward supports pageflip but not the display */ + /* in case the hardware supports pageflip but not the display */ if ((win_dst = wm_window_copy_test(C, win_src, false, false))) { /* pass */ } diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 6ba5db20c07..c460ea88474 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -2043,7 +2043,7 @@ void WM_window_screen_rect_calc(const wmWindow *win, rcti *r_rect) WM_window_rect_calc(win, &window_rect); screen_rect = window_rect; - /* Substract global areas from screen rectangle. */ + /* Subtract global areas from screen rectangle. */ for (ScrArea *global_area = win->global_areas.areabase.first; global_area; global_area = global_area->next) { int height = ED_area_global_size_y(global_area) - 1; diff --git a/source/blender/windowmanager/wm_event_system.h b/source/blender/windowmanager/wm_event_system.h index 1dcd0cb62d0..a0610ffcff3 100644 --- a/source/blender/windowmanager/wm_event_system.h +++ b/source/blender/windowmanager/wm_event_system.h @@ -40,7 +40,7 @@ struct ScrArea; struct ARegion; -/* wmKeyMap is in DNA_windowmanager.h, it's savable */ +/* wmKeyMap is in DNA_windowmanager.h, it's saveable */ struct wmEventHandler_KeymapFn { void (*handle_post_fn)(wmKeyMap *keymap, wmKeyMapItem *kmi, void *user_data); -- cgit v1.2.3