From a4a9d14ba71100259f19bd62e8c2f27cd8b7862f Mon Sep 17 00:00:00 2001 From: luzpaz Date: Fri, 5 Feb 2021 19:07:03 -0800 Subject: [PATCH] UI: Fix Typos in Comments and Docs Approximately 91 spelling corrections, almost all in comments. Differential Revision: https://developer.blender.org/D10288 Reviewed by Harley Acheson --- source/blender/blendthumb/src/Dll.cpp | 2 +- source/blender/blenkernel/BKE_attribute_access.hh | 2 +- source/blender/blenkernel/BKE_lib_query.h | 2 +- source/blender/blenkernel/BKE_subdiv_ccg.h | 2 +- source/blender/blenkernel/intern/anim_sys.c | 2 +- source/blender/blenkernel/intern/brush.c | 2 +- source/blender/blenkernel/intern/constraint.c | 2 +- source/blender/blenkernel/intern/fcurve.c | 2 +- source/blender/blenkernel/intern/mask_evaluate.c | 2 +- source/blender/blenkernel/intern/mesh.c | 2 +- source/blender/blenkernel/intern/mesh_fair.cc | 2 +- source/blender/blenkernel/intern/mesh_validate.cc | 2 +- source/blender/blenkernel/intern/paint.c | 2 +- source/blender/blenkernel/intern/particle.c | 2 +- source/blender/blenkernel/intern/tracking_test.cc | 2 +- source/blender/blenkernel/intern/volume.cc | 2 +- source/blender/blenlib/intern/BLI_kdopbvh.c | 2 +- source/blender/blenlib/intern/path_util.c | 2 +- source/blender/bmesh/intern/bmesh_opdefines.c | 2 +- source/blender/datatoc/CMakeLists.txt | 2 +- .../depsgraph/intern/builder/deg_builder_relations.cc | 2 +- .../depsgraph/intern/eval/deg_eval_runtime_backup_scene.h | 2 +- source/blender/draw/engines/eevee/eevee_lut_gen.c | 2 +- source/blender/draw/engines/eevee/eevee_materials.c | 2 +- source/blender/draw/engines/eevee/eevee_motion_blur.c | 2 +- source/blender/draw/engines/eevee/eevee_private.h | 2 +- source/blender/draw/engines/eevee/eevee_shaders.c | 2 +- .../engines/eevee/shaders/effect_motion_blur_frag.glsl | 2 +- .../blender/draw/engines/eevee/shaders/raytrace_lib.glsl | 2 +- .../draw/engines/gpencil/shaders/gpencil_common_lib.glsl | 2 +- .../draw/engines/gpencil/shaders/gpencil_vfx_frag.glsl | 2 +- source/blender/draw/engines/image/image_shader.c | 2 +- source/blender/draw/engines/overlay/overlay_extra.c | 2 +- source/blender/draw/engines/overlay/overlay_shader.c | 2 +- .../draw/engines/overlay/shaders/antialiasing_frag.glsl | 2 +- .../blender/draw/engines/overlay/shaders/extra_vert.glsl | 2 +- .../draw/engines/overlay/shaders/extra_wire_vert.glsl | 2 +- .../draw/engines/overlay/shaders/wireframe_vert.glsl | 2 +- source/blender/draw/engines/workbench/workbench_shader.c | 2 +- source/blender/draw/intern/draw_cache_extract_mesh.c | 6 +++--- source/blender/draw/intern/shaders/common_smaa_lib.glsl | 2 +- source/blender/editors/animation/anim_motion_paths.c | 2 +- source/blender/editors/armature/meshlaplacian.c | 2 +- source/blender/editors/curve/editcurve.c | 8 ++++---- source/blender/editors/gpencil/gpencil_vertex_paint.c | 2 +- source/blender/editors/include/ED_fileselect.h | 2 +- source/blender/editors/include/ED_keyframes_edit.h | 2 +- source/blender/editors/interface/interface_handlers.c | 6 +++--- source/blender/editors/object/object_relations.c | 2 +- source/blender/editors/render/render_opengl.c | 2 +- source/blender/editors/space_file/file_draw.c | 2 +- source/blender/editors/space_view3d/space_view3d.c | 2 +- .../editors/transform/transform_convert_sequencer.c | 2 +- source/blender/freestyle/intern/python/BPy_Operators.cpp | 4 ++-- source/blender/freestyle/intern/view_map/ViewMap.h | 6 +++--- source/blender/gpu/GPU_batch.h | 2 +- source/blender/gpu/opengl/gl_backend.cc | 2 +- source/blender/gpu/opengl/gl_context.hh | 4 ++-- .../gpu/shaders/gpu_shader_2D_widget_base_vert.glsl | 2 +- source/blender/makesdna/DNA_brush_types.h | 2 +- source/blender/makesdna/DNA_cloth_types.h | 2 +- source/blender/makesdna/DNA_gpencil_modifier_types.h | 2 +- source/blender/makesdna/DNA_modifier_defaults.h | 2 +- .../blender/makesrna/intern/rna_access_compare_override.c | 2 +- source/blender/makesrna/intern/rna_mesh_api.c | 4 ++-- source/blender/makesrna/intern/rna_nodetree.c | 2 +- source/blender/makesrna/intern/rna_object.c | 8 ++++---- source/blender/makesrna/intern/rna_space.c | 2 +- source/blender/modifiers/intern/MOD_surfacedeform.c | 4 ++-- source/blender/python/bmesh/bmesh_py_types.c | 2 +- source/blender/render/intern/pipeline.c | 2 +- source/blender/sequencer/SEQ_render.h | 2 +- source/blender/sequencer/intern/image_cache.c | 2 +- source/blender/windowmanager/intern/wm_draw.c | 2 +- source/blender/windowmanager/intern/wm_event_system.c | 2 +- source/creator/CMakeLists.txt | 2 +- 76 files changed, 92 insertions(+), 92 deletions(-) diff --git a/source/blender/blendthumb/src/Dll.cpp b/source/blender/blendthumb/src/Dll.cpp index 8a8ae8c9996..6516540034e 100644 --- a/source/blender/blendthumb/src/Dll.cpp +++ b/source/blender/blendthumb/src/Dll.cpp @@ -160,7 +160,7 @@ struct REGISTRY_ENTRY { PCWSTR pszValueName; DWORD dwValueType; PCWSTR pszData; // These two fields could/should have been a union, but C++ - DWORD dwData; // only lets you initalize the first field in a union. + DWORD dwData; // only lets you initialize the first field in a union. }; // Creates a registry key (if needed) and sets the default value of the key diff --git a/source/blender/blenkernel/BKE_attribute_access.hh b/source/blender/blenkernel/BKE_attribute_access.hh index bca96aac665..55c8b36669d 100644 --- a/source/blender/blenkernel/BKE_attribute_access.hh +++ b/source/blender/blenkernel/BKE_attribute_access.hh @@ -128,7 +128,7 @@ class WriteAttribute { void *array_buffer_ = nullptr; /* True, when the buffer points to a temporary array. */ bool array_is_temporary_ = false; - /* This helps to protect agains forgetting to apply changes done to the array. */ + /* This helps to protect against forgetting to apply changes done to the array. */ bool array_should_be_applied_ = false; public: diff --git a/source/blender/blenkernel/BKE_lib_query.h b/source/blender/blenkernel/BKE_lib_query.h index b6abe0bf18c..bdda5bb0372 100644 --- a/source/blender/blenkernel/BKE_lib_query.h +++ b/source/blender/blenkernel/BKE_lib_query.h @@ -77,7 +77,7 @@ enum { IDWALK_CB_USER = (1 << 8), /** * This ID usage is not refcounted, but at least one user should be generated by it (to avoid - * e.g. loosing the used ID on save/reload). + * e.g. losing the used ID on save/reload). * Callback is responsible to deal accordingly with #ID.us if needed. */ IDWALK_CB_USER_ONE = (1 << 9), diff --git a/source/blender/blenkernel/BKE_subdiv_ccg.h b/source/blender/blenkernel/BKE_subdiv_ccg.h index f0ca154c4b9..b7d4ab8d8ed 100644 --- a/source/blender/blenkernel/BKE_subdiv_ccg.h +++ b/source/blender/blenkernel/BKE_subdiv_ccg.h @@ -293,7 +293,7 @@ bool BKE_subdiv_ccg_check_coord_valid(const SubdivCCG *subdiv_ccg, const SubdivC * neighbor elements in total). * * - For the corner element a single neighboring element on every adjacent edge, single from - * every gird. + * every grid. * * - For the boundary element two neighbor elements on the boundary (from same grid) and one * element inside of every neighboring grid. */ diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index aef5fad269f..965dc4e0bec 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -1594,7 +1594,7 @@ static bool nla_combine_get_inverted_strip_value(const int mix_mode, if (IS_EQF(base_value, 0.0f)) { base_value = 1.0f; } - /* Divison by zero. */ + /* Division by zero. */ if (IS_EQF(lower_value, 0.0f)) { /* Resolve 0/0 to 1. */ if (IS_EQF(blended_value, 0.0f)) { diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 28c8ae3e416..9fbefacbece 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -375,7 +375,7 @@ static int brush_undo_preserve_cb(LibraryIDLinkCallbackData *cb_data) static void brush_undo_preserve(BlendLibReader *reader, ID *id_new, ID *id_old) { - /* Whole Brush is preserved accross undo's. */ + /* Whole Brush is preserved across undos. */ BKE_lib_id_swap(NULL, id_new, id_old); /* `id_new` now has content from `id_old`, we need to ensure those old ID pointers are valid. diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 0bf27a50a32..d04a27adec8 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -4693,7 +4693,7 @@ static void pivotcon_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *ta copy_m3_m4(rotMat, cob->matrix); normalize_m3(rotMat); - /* correct the pivot by the rotation axis otherwise the pivot translates when it shouldnt */ + /* correct the pivot by the rotation axis otherwise the pivot translates when it shouldn't */ mat3_normalized_to_axis_angle(axis, &angle, rotMat); if (angle) { float dvec[3]; diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index ce710e2f7d4..8e1fa9732ea 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -1110,7 +1110,7 @@ void fcurve_samples_to_keyframes(FCurve *fcu, const int start, const int end) if (fcu->fpt == NULL) { /* No data to unbake. */ - CLOG_ERROR(&LOG, "Error: Curve containts no baked keyframes"); + CLOG_ERROR(&LOG, "Error: Curve contains no baked keyframes"); return; } diff --git a/source/blender/blenkernel/intern/mask_evaluate.c b/source/blender/blenkernel/intern/mask_evaluate.c index a42836b5399..69f60ca0384 100644 --- a/source/blender/blenkernel/intern/mask_evaluate.c +++ b/source/blender/blenkernel/intern/mask_evaluate.c @@ -665,7 +665,7 @@ static float (*mask_spline_feather_differentiated_points_with_resolution__double len_feather = len_v2v2(bezt_prev->vec[1], bezt_curr->vec[1]); - /* scale by chane in length */ + /* scale by change in length */ len_scalar = len_feather / len_base; dist_ensure_v2_v2fl(bezt_prev->vec[2], bezt_prev->vec[1], diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 622f6d7a7b8..c15484f8e72 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1219,7 +1219,7 @@ int test_index_face(MFace *mface, CustomData *fdata, int mfindex, int nr) } /* Check corrupt cases, bow-tie geometry, - * cant handle these because edge data wont exist so just return 0. */ + * can't handle these because edge data won't exist so just return 0. */ if (nr == 3) { if ( /* real edges */ diff --git a/source/blender/blenkernel/intern/mesh_fair.cc b/source/blender/blenkernel/intern/mesh_fair.cc index 75dd396d10a..ac6dd96ed90 100644 --- a/source/blender/blenkernel/intern/mesh_fair.cc +++ b/source/blender/blenkernel/intern/mesh_fair.cc @@ -475,7 +475,7 @@ static void prefair_and_fair_vertices(FairingContext *fairing_context, /* Fair. */ VoronoiVertexWeight *voronoi_vertex_weights = new VoronoiVertexWeight(fairing_context); - /* TODO: Implemente cotangent loop weights. */ + /* TODO: Implement cotangent loop weights. */ fairing_context->fair_vertices( affected_vertices, depth, voronoi_vertex_weights, uniform_loop_weights); diff --git a/source/blender/blenkernel/intern/mesh_validate.cc b/source/blender/blenkernel/intern/mesh_validate.cc index 0aaca33124a..0b0aeb50d37 100644 --- a/source/blender/blenkernel/intern/mesh_validate.cc +++ b/source/blender/blenkernel/intern/mesh_validate.cc @@ -263,6 +263,6 @@ void BKE_mesh_calc_edges(Mesh *mesh, bool keep_existing_edges, const bool select mesh->totedge = new_totedge; mesh->medge = new_edges.data(); - /* Explicitely clear edge maps, because that way it can be parallelized. */ + /* Explicitly clear edge maps, because that way it can be parallelized. */ clear_hash_tables(edge_maps); } diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 13f4304f923..98ee9e1da75 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -127,7 +127,7 @@ static void palette_blend_read_data(BlendDataReader *reader, ID *id) static void palette_undo_preserve(BlendLibReader *UNUSED(reader), ID *id_new, ID *id_old) { - /* Whole Palette is preserved accross undo's, and it has no extra pointer, simple. */ + /* Whole Palette is preserved across undos, and it has no extra pointer, simple. */ /* Note: We do not care about potential internal references to self here, Palette has none. */ /* Note: We do not swap IDProperties, as dealing with potential ID pointers in those would be * fairly delicate. */ diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index ec3b6198d7c..21d1e070389 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -2304,7 +2304,7 @@ void psys_particle_on_emitter(ParticleSystemModifierData *psmd, } return; } - /* we cant use the num_dmcache */ + /* we can't use the num_dmcache */ psys_particle_on_dm( psmd->mesh_final, from, index, index_dmcache, fuv, foffset, vec, nor, utan, vtan, orco); } diff --git a/source/blender/blenkernel/intern/tracking_test.cc b/source/blender/blenkernel/intern/tracking_test.cc index 2877d8db358..a3845dcad8f 100644 --- a/source/blender/blenkernel/intern/tracking_test.cc +++ b/source/blender/blenkernel/intern/tracking_test.cc @@ -138,7 +138,7 @@ TEST_F(TrackingTest, BKE_tracking_marker_get_interpolated) BKE_tracking_track_free(&track); } - /* More comprehensive test, which resembles real life trackign scenario better. */ + /* More comprehensive test, which resembles real-life tracking scenario better. */ { MovieTrackingTrack track = {nullptr}; diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index 77cfb3ffea5..edf40ab3861 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -145,7 +145,7 @@ static struct VolumeFileCache { /* Has the grid tree been loaded? */ bool is_loaded; - /* Error message if an error occured during loading. */ + /* Error message if an error occurred while loading. */ std::string error_msg; /* User counting. */ int num_metadata_users; diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index e1e71b02615..a0e94e00634 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -1312,7 +1312,7 @@ BVHTreeOverlap *BLI_bvhtree_overlap_ex( bool use_threading = (flag & BVH_OVERLAP_USE_THREADING) != 0 && (tree1->totleaf > KDOPBVH_THREAD_LEAF_THRESHOLD); - /* `RETURN_PAIRS` was not implemented without `max_interations`. */ + /* 'RETURN_PAIRS' was not implemented without 'max_interactions'. */ BLI_assert(overlap_pairs || max_interactions); const int root_node_len = BLI_bvhtree_overlap_thread_num(tree1); diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 39f5abc4cd8..b076d0f09c1 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -1375,7 +1375,7 @@ void BLI_make_file_string(const char *relabase, char *string, const char *dir, c } } else { - return; /* string is NULL, probably shouldnt happen but return anyway */ + return; /* string is NULL, probably shouldn't happen but return anyway */ } /* Resolve relative references */ diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index a259d97379d..a4e0d46e544 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -731,7 +731,7 @@ static BMOpDefine bmo_edgenet_fill_def = { * * - One single loop; an edge is added to connect the ends * - Two loops; two edges are added to connect the endpoints (based on the - * shortest distance between each endpont). + * shortest distance between each endpoint). */ static BMOpDefine bmo_edgenet_prepare_def = { "edgenet_prepare", diff --git a/source/blender/datatoc/CMakeLists.txt b/source/blender/datatoc/CMakeLists.txt index 27dc01f1750..8411a1a468e 100644 --- a/source/blender/datatoc/CMakeLists.txt +++ b/source/blender/datatoc/CMakeLists.txt @@ -53,7 +53,7 @@ if(NOT WITH_HEADLESS) include_directories(${PNG_INCLUDE_DIRS}) if(NOT APPLE) - # APPLE plaform uses full paths for linking libraries. + # APPLE platform uses full paths for linking libraries. link_directories(${PNG_LIBPATH} ${ZLIB_LIBPATH}) endif() diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index ffddb196ae4..96b4da34347 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -2496,7 +2496,7 @@ void DepsgraphRelationBuilder::build_material(Material *material) /* Animated / driven parameters (without nodetree). */ OperationKey material_key(&material->id, NodeType::SHADING, OperationCode::MATERIAL_UPDATE); ComponentKey parameters_key(&material->id, NodeType::PARAMETERS); - add_relation(parameters_key, material_key, "Material's paramters"); + add_relation(parameters_key, material_key, "Material's parameters"); /* material's nodetree */ if (material->nodetree != nullptr) { diff --git a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.h b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.h index 007236e7890..d16f5b9b5ce 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.h +++ b/source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_scene.h @@ -46,7 +46,7 @@ class SceneBackup { * * NOTE: Scene can not disappear after relations update, because otherwise the entire dependency * graph will be gone. This means we don't need to compare original scene pointer, or worry about - * freeing those if they cant' be restored: we just copy them over to a new scene. */ + * freeing those if they can't be restored: we just copy them over to a new scene. */ void *sound_scene; void *playback_handle; void *sound_scrub_handle; diff --git a/source/blender/draw/engines/eevee/eevee_lut_gen.c b/source/blender/draw/engines/eevee/eevee_lut_gen.c index b74cb6c7687..18645fea5e0 100644 --- a/source/blender/draw/engines/eevee/eevee_lut_gen.c +++ b/source/blender/draw/engines/eevee/eevee_lut_gen.c @@ -22,7 +22,7 @@ * EEVEE LUT generation: * * Routine to generate the LUT used by eevee stored in eevee_lut.h - * Theses functions are not to be used in the final executable. + * These functions are not to be used in the final executable. */ #include "DRW_render.h" diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index 56e4af0b6de..5f2821730f1 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -415,7 +415,7 @@ void EEVEE_materials_cache_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata) { /* Renderpass accumulation. */ DRWState state = DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_EQUAL | DRW_STATE_BLEND_ADD_FULL; - /* Create an instance of each of theses passes and link them together. */ + /* Create an instance of each of these passes and link them together. */ DRWPass *passes[] = { psl->material_ps, psl->material_cull_ps, diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.c b/source/blender/draw/engines/eevee/eevee_motion_blur.c index 8dcab579603..0a79d9466e9 100644 --- a/source/blender/draw/engines/eevee/eevee_motion_blur.c +++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c @@ -476,7 +476,7 @@ void EEVEE_motion_blur_cache_finish(EEVEE_Data *vedata) if (vbo) { /* Use the vbo to perform the copy on the GPU. */ GPU_vertbuf_use(vbo); - /* Perform a copy to avoid loosing it after RE_engine_frame_set(). */ + /* Perform a copy to avoid losing it after RE_engine_frame_set(). */ mb_geom->vbo[mb_step] = vbo = GPU_vertbuf_duplicate(vbo); /* Find and replace "pos" attrib name. */ GPUVertFormat *format = (GPUVertFormat *)GPU_vertbuf_get_format(vbo); diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h index 9845ec903e5..e48f5f9dd32 100644 --- a/source/blender/draw/engines/eevee/eevee_private.h +++ b/source/blender/draw/engines/eevee/eevee_private.h @@ -716,7 +716,7 @@ typedef struct EEVEE_EffectsInfo { CameraParams past_cam_params; CameraParams current_cam_params; char motion_blur_step; /* Which step we are evaluating. */ - int motion_blur_max; /* Maximum distance in pixels a motion blured pixel can cover. */ + int motion_blur_max; /* Maximum distance in pixels a motion-blurred pixel can cover. */ float motion_blur_near_far[2]; /* Camera near/far clip distances (positive). */ bool cam_params_init; /* TODO(fclem): Only used in render mode for now. diff --git a/source/blender/draw/engines/eevee/eevee_shaders.c b/source/blender/draw/engines/eevee/eevee_shaders.c index 7a83bebdeca..52d330c3ad2 100644 --- a/source/blender/draw/engines/eevee/eevee_shaders.c +++ b/source/blender/draw/engines/eevee/eevee_shaders.c @@ -258,7 +258,7 @@ static void eevee_shader_library_ensure(void) { if (e_data.lib == NULL) { e_data.lib = DRW_shader_library_create(); - /* NOTE: Theses needs to be ordered by dependencies. */ + /* NOTE: These need to be ordered by dependencies. */ DRW_SHADER_LIB_ADD(e_data.lib, common_math_lib); DRW_SHADER_LIB_ADD(e_data.lib, common_math_geom_lib); DRW_SHADER_LIB_ADD(e_data.lib, common_hair_lib); diff --git a/source/blender/draw/engines/eevee/shaders/effect_motion_blur_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_motion_blur_frag.glsl index 9199eae816d..0aa54715460 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_motion_blur_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_motion_blur_frag.glsl @@ -60,7 +60,7 @@ vec2 sample_weights(float center_depth, float sample_motion_length, float offset_length) { - /* Clasify foreground/background. */ + /* Classify foreground/background. */ vec2 depth_weight = depth_compare(center_depth, sample_depth); /* Weight if sample is overlapping or under the center pixel. */ vec2 spread_weight = spread_compare(center_motion_length, sample_motion_length, offset_length); diff --git a/source/blender/draw/engines/eevee/shaders/raytrace_lib.glsl b/source/blender/draw/engines/eevee/shaders/raytrace_lib.glsl index 5f14f590128..aebd1c3aef3 100644 --- a/source/blender/draw/engines/eevee/shaders/raytrace_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/raytrace_lib.glsl @@ -238,7 +238,7 @@ vec3 raycast(int index, #endif } - /* Discard backface hits. Only do this if the ray traveled enough to avoid loosing intricate + /* Discard backface hits. Only do this if the ray traveled enough to avoid losing intricate * contact reflections. This is only used for SSReflections. */ if (discard_backface && prev_delta < 0.0 && curr_time > 4.1) { hit = false; diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl index 189ed91cbb4..3065d553dce 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl @@ -393,7 +393,7 @@ void stroke_vertex() is_squares = false; } - /* Enpoints, we discard the vertices. */ + /* Endpoints, we discard the vertices. */ if (ma1.x == -1 || (!is_dot && ma2.x == -1)) { discard_vert(); return; diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_vfx_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_vfx_frag.glsl index 503248558ad..aedc8668387 100644 --- a/source/blender/draw/engines/gpencil/shaders/gpencil_vfx_frag.glsl +++ b/source/blender/draw/engines/gpencil/shaders/gpencil_vfx_frag.glsl @@ -274,7 +274,7 @@ uniform bool isFirstPass; vec2 compute_uvs(float x) { vec2 uv = uvcoordsvar.xy; - /* Tranform UV (loc, rot, scale) */ + /* Transform UV (loc, rot, scale) */ uv = uv.x * uvRotX + uv.y * uvRotY + uvOffset; uv += blurDir * x; /* Wave deform. */ diff --git a/source/blender/draw/engines/image/image_shader.c b/source/blender/draw/engines/image/image_shader.c index 7dc428de2ee..691c0d7029a 100644 --- a/source/blender/draw/engines/image/image_shader.c +++ b/source/blender/draw/engines/image/image_shader.c @@ -49,7 +49,7 @@ void IMAGE_shader_library_ensure(void) { if (e_data.lib == NULL) { e_data.lib = DRW_shader_library_create(); - /* NOTE: Theses needs to be ordered by dependencies. */ + /* NOTE: These need to be ordered by dependencies. */ DRW_SHADER_LIB_ADD(e_data.lib, common_colormanagement_lib); DRW_SHADER_LIB_ADD(e_data.lib, common_globals_lib); DRW_SHADER_LIB_ADD(e_data.lib, common_view_lib); diff --git a/source/blender/draw/engines/overlay/overlay_extra.c b/source/blender/draw/engines/overlay/overlay_extra.c index 91e605bf0ae..00429a19cf4 100644 --- a/source/blender/draw/engines/overlay/overlay_extra.c +++ b/source/blender/draw/engines/overlay/overlay_extra.c @@ -1176,7 +1176,7 @@ void OVERLAY_camera_cache_populate(OVERLAY_Data *vedata, Object *ob) invert_v3(scale); for (int i = 0; i < 4; i++) { mul_v3_v3(vec[i], scale); - /* Project to z=-1 plane. Makes positionning / scaling easier. (see shader) */ + /* Project to z=-1 plane. Makes positioning / scaling easier. (see shader) */ mul_v2_fl(vec[i], 1.0f / fabsf(vec[i][2])); } diff --git a/source/blender/draw/engines/overlay/overlay_shader.c b/source/blender/draw/engines/overlay/overlay_shader.c index 88f4e28c039..6b07547bf96 100644 --- a/source/blender/draw/engines/overlay/overlay_shader.c +++ b/source/blender/draw/engines/overlay/overlay_shader.c @@ -238,7 +238,7 @@ void OVERLAY_shader_library_ensure(void) { if (e_data.lib == NULL) { e_data.lib = DRW_shader_library_create(); - /* NOTE: Theses needs to be ordered by dependencies. */ + /* NOTE: These need to be ordered by dependencies. */ DRW_SHADER_LIB_ADD(e_data.lib, common_globals_lib); DRW_SHADER_LIB_ADD(e_data.lib, common_overlay_lib); DRW_SHADER_LIB_ADD(e_data.lib, common_colormanagement_lib); diff --git a/source/blender/draw/engines/overlay/shaders/antialiasing_frag.glsl b/source/blender/draw/engines/overlay/shaders/antialiasing_frag.glsl index 2989e07691f..f24aee56bb2 100644 --- a/source/blender/draw/engines/overlay/shaders/antialiasing_frag.glsl +++ b/source/blender/draw/engines/overlay/shaders/antialiasing_frag.glsl @@ -146,7 +146,7 @@ void main() vec4 lines = vec4(neightbor_line0.z, neightbor_line1.z, neightbor_line2.z, neightbor_line3.z); /* Count number of line neighbors. */ float blend = dot(vec4(0.25), step(0.001, lines)); - /* Only do blend if there is more than 2 neighbor. This avoid loosing too much AA. */ + /* Only do blend if there are more than 2 neighbors. This avoids losing too much AA. */ blend = clamp(blend * 2.0 - 1.0, 0.0, 1.0); fragColor = mix(fragColor, fragColor / fragColor.a, blend); } diff --git a/source/blender/draw/engines/overlay/shaders/extra_vert.glsl b/source/blender/draw/engines/overlay/shaders/extra_vert.glsl index 89bc0bcf522..74854dc0f8d 100644 --- a/source/blender/draw/engines/overlay/shaders/extra_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/extra_vert.glsl @@ -222,7 +222,7 @@ void main() edgePos = edgeStart = ((gl_Position.xy / gl_Position.w) * 0.5 + 0.5) * sizeViewport.xy; #ifdef SELECT_EDGES - /* HACK: to avoid loosing sub pixel object in selections, we add a bit of randomness to the + /* HACK: to avoid losing sub-pixel object in selections, we add a bit of randomness to the * wire to at least create one fragment that will pass the occlusion query. */ /* TODO(fclem): Limit this workaround to selection. It's not very noticeable but still... */ gl_Position.xy += sizeViewportInv.xy * gl_Position.w * ((gl_VertexID % 2 == 0) ? -1.0 : 1.0); diff --git a/source/blender/draw/engines/overlay/shaders/extra_wire_vert.glsl b/source/blender/draw/engines/overlay/shaders/extra_wire_vert.glsl index 8a80441b5d9..91f45329018 100644 --- a/source/blender/draw/engines/overlay/shaders/extra_wire_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/extra_wire_vert.glsl @@ -18,7 +18,7 @@ void main() gl_Position = point_world_to_ndc(world_pos); #ifdef SELECT_EDGES - /* HACK: to avoid loosing sub pixel object in selections, we add a bit of randomness to the + /* HACK: to avoid losing sub-pixel object in selections, we add a bit of randomness to the * wire to at least create one fragment that will pass the occlusion query. */ /* TODO(fclem): Limit this workaround to selection. It's not very noticeable but still... */ gl_Position.xy += sizeViewportInv.xy * gl_Position.w * ((gl_VertexID % 2 == 0) ? -1.0 : 1.0); diff --git a/source/blender/draw/engines/overlay/shaders/wireframe_vert.glsl b/source/blender/draw/engines/overlay/shaders/wireframe_vert.glsl index c80d8f99628..c083fdacbbe 100644 --- a/source/blender/draw/engines/overlay/shaders/wireframe_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/wireframe_vert.glsl @@ -169,7 +169,7 @@ void main() } #ifdef SELECT_EDGES - /* HACK: to avoid loosing sub pixel object in selections, we add a bit of randomness to the + /* HACK: to avoid losing sub-pixel object in selections, we add a bit of randomness to the * wire to at least create one fragment that will pass the occlusion query. */ gl_Position.xy += sizeViewportInv.xy * gl_Position.w * ((gl_VertexID % 2 == 0) ? -1.0 : 1.0); #endif diff --git a/source/blender/draw/engines/workbench/workbench_shader.c b/source/blender/draw/engines/workbench/workbench_shader.c index 1c612404c95..ad610a6a885 100644 --- a/source/blender/draw/engines/workbench/workbench_shader.c +++ b/source/blender/draw/engines/workbench/workbench_shader.c @@ -120,7 +120,7 @@ void workbench_shader_library_ensure(void) { if (e_data.lib == NULL) { e_data.lib = DRW_shader_library_create(); - /* NOTE: Theses needs to be ordered by dependencies. */ + /* NOTE: These need to be ordered by dependencies. */ DRW_SHADER_LIB_ADD(e_data.lib, common_math_lib); DRW_SHADER_LIB_ADD(e_data.lib, common_math_geom_lib); DRW_SHADER_LIB_ADD(e_data.lib, common_hair_lib); diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.c b/source/blender/draw/intern/draw_cache_extract_mesh.c index 9e2ac26f9f0..d9fbb01789f 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh.c +++ b/source/blender/draw/intern/draw_cache_extract_mesh.c @@ -907,7 +907,7 @@ static void extract_tris_finish(const MeshRenderData *mr, if (mr->use_final_mesh && cache->final.tris_per_mat) { MeshBufferCache *mbc = &cache->final; for (int i = 0; i < mr->mat_len; i++) { - /* Theses IBOs have not been queried yet but we create them just in case they are needed + /* These IBOs have not been queried yet but we create them just in case they are needed * later since they are not tracked by mesh_buffer_cache_create_requested(). */ if (mbc->tris_per_mat[i] == NULL) { mbc->tris_per_mat[i] = GPU_indexbuf_calloc(); @@ -1380,7 +1380,7 @@ static void extract_lines_paint_mask_iter_poly_mesh(const MeshRenderData *mr, } } else { - /* Set theses unselected loop only if this edge has no other selected loop. */ + /* Set these unselected loop only if this edge has no other selected loop. */ if (!BLI_BITMAP_TEST(data->select_map, e_index)) { GPU_indexbuf_set_line_verts(&data->elb, e_index, ml_index, ml_index_other); } @@ -5230,7 +5230,7 @@ static void *extract_skin_roots_init(const MeshRenderData *mr, } } - /* It's really unlikely that all verts will be roots. Resize to avoid loosing VRAM. */ + /* It's really unlikely that all verts will be roots. Resize to avoid losing VRAM. */ GPU_vertbuf_data_len_set(vbo, root_len); return NULL; diff --git a/source/blender/draw/intern/shaders/common_smaa_lib.glsl b/source/blender/draw/intern/shaders/common_smaa_lib.glsl index 78a62c6ae7d..36ffb4d8b32 100644 --- a/source/blender/draw/intern/shaders/common_smaa_lib.glsl +++ b/source/blender/draw/intern/shaders/common_smaa_lib.glsl @@ -118,7 +118,7 @@ * half-rate linear filtering on GCN. * * If SMAA is applied to 64-bit color buffers, switching to point filtering - * when accesing them will increase the performance. Search for + * when accessing them will increase the performance. Search for * 'SMAASamplePoint' to see which textures may benefit from point * filtering, and where (which is basically the color input in the edge * detection and resolve passes). diff --git a/source/blender/editors/animation/anim_motion_paths.c b/source/blender/editors/animation/anim_motion_paths.c index bd7d0eed2c9..aac2465d43a 100644 --- a/source/blender/editors/animation/anim_motion_paths.c +++ b/source/blender/editors/animation/anim_motion_paths.c @@ -331,7 +331,7 @@ static void motionpath_calculate_update_range(MPathTarget *mpt, int fcu_sfra = motionpath_get_prev_prev_keyframe(mpt, &fcu_keys, current_frame); int fcu_efra = motionpath_get_next_next_keyframe(mpt, &fcu_keys, current_frame); - /* Extend range fuhrer, since acceleration compensation propagates even further away. */ + /* Extend range further, since acceleration compensation propagates even further away. */ if (fcu->auto_smoothing != FCURVE_SMOOTH_NONE) { fcu_sfra = motionpath_get_prev_prev_keyframe(mpt, &fcu_keys, fcu_sfra); fcu_efra = motionpath_get_next_next_keyframe(mpt, &fcu_keys, fcu_efra); diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c index ae1516dad05..e362a2e2f40 100644 --- a/source/blender/editors/armature/meshlaplacian.c +++ b/source/blender/editors/armature/meshlaplacian.c @@ -497,7 +497,7 @@ static float heat_source_distance(LaplacianSystem *sys, int vertex, int source) { float closest[3], d[3], dist, cosine; - /* compute euclidian distance */ + /* compute Euclidean distance */ closest_to_line_segment_v3( closest, sys->heat.verts[vertex], sys->heat.root[source], sys->heat.tip[source]); diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index e9ceedf7ce2..8ebc2077619 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -2419,7 +2419,7 @@ static void adduplicateflagNurb( memcpy(newnu->bp, &nu->bp[a], newu * newv * sizeof(BPoint)); memcpy(&newnu->bp[newu * newv], nu->bp, newu * cyclicv * sizeof(BPoint)); - /* check for actvert in cylicv selection */ + /* check for actvert in cyclicv selection */ if (cu->actnu == i) { calc_duplicate_actvert( editnurb, newnurb, cu, cu->actvert, a, (newu * newv) + cu->actvert); @@ -6102,7 +6102,7 @@ static bool curve_delete_segments(Object *obedit, View3D *v3d, const bool split) } if (!split && cut != -1 && nu->pntsu > 2 && !(nu->flagu & CU_NURB_CYCLIC)) { - /* start and points copied if connecting segment was deleted and not cylic spline */ + /* start and points copied if connecting segment was deleted and not cyclic spline */ bezt1 = nu->bezt; bezt2 = &nu->bezt[1]; @@ -6232,7 +6232,7 @@ static bool curve_delete_segments(Object *obedit, View3D *v3d, const bool split) } if (!split && cut != -1 && nu->pntsu > 2 && !(nu->flagu & CU_NURB_CYCLIC)) { - /* start and points copied if connecting segment was deleted and not cylic spline */ + /* start and points copied if connecting segment was deleted and not cyclic spline */ bp1 = nu->bp; bp2 = &nu->bp[1]; @@ -6352,7 +6352,7 @@ static bool curve_delete_segments(Object *obedit, View3D *v3d, const bool split) } if (!split && cut != -1 && nu->pntsv > 2 && !(nu->flagv & CU_NURB_CYCLIC)) { - /* start and points copied if connecting segment was deleted and not cylic spline */ + /* start and points copied if connecting segment was deleted and not cyclic spline */ bp1 = nu->bp; bp2 = &nu->bp[nu->pntsu]; diff --git a/source/blender/editors/gpencil/gpencil_vertex_paint.c b/source/blender/editors/gpencil/gpencil_vertex_paint.c index ae94836af03..a05cc3c4dbd 100644 --- a/source/blender/editors/gpencil/gpencil_vertex_paint.c +++ b/source/blender/editors/gpencil/gpencil_vertex_paint.c @@ -151,7 +151,7 @@ typedef struct tGP_BrushVertexpaintData { tGP_Grid *grid; /** Total number of rows/cols. */ int grid_size; - /** Total number of cells elments in the grid array. */ + /** Total number of cells elements in the grid array. */ int grid_len; /** Grid sample position (used to determine distance of falloff) */ int grid_sample[2]; diff --git a/source/blender/editors/include/ED_fileselect.h b/source/blender/editors/include/ED_fileselect.h index d12882f0e29..7538dac1354 100644 --- a/source/blender/editors/include/ED_fileselect.h +++ b/source/blender/editors/include/ED_fileselect.h @@ -194,7 +194,7 @@ typedef enum FSMenuInsert { FS_INSERT_SAVE = (1 << 1), /** moves the item to the front of the list when its not already there */ FS_INSERT_FIRST = (1 << 2), - /** just append to preseve delivered order */ + /** just append to preserve delivered order */ FS_INSERT_LAST = (1 << 3), } FSMenuInsert; diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h index b08ab57545f..63f124798aa 100644 --- a/source/blender/editors/include/ED_keyframes_edit.h +++ b/source/blender/editors/include/ED_keyframes_edit.h @@ -118,7 +118,7 @@ typedef struct KeyframeEdit_CircleData { } KeyframeEdit_CircleData; /* ************************************************ */ -/* Non-Destuctive Editing API (keyframes_edit.c) */ +/* Non-Destructive Editing API (keyframes_edit.c) */ /* --- Defines for 'OK' polls + KeyframeEditData Flags --------- */ diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index abe40f88ec6..1bfd84a7046 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -6837,7 +6837,7 @@ static bool ui_numedit_but_CURVE(uiBlock *block, #ifdef USE_CONT_MOUSE_CORRECT /* note: using 'cmp_last' is weak since there may be multiple points selected, - * but in practice this isnt really an issue */ + * but in practice this isn't really an issue */ if (ui_but_is_cursor_warp(but)) { /* OK but can go outside bounds */ data->ungrab_mval[0] = but->rect.xmin + ((cmp_last->x - cumap->curr.xmin) * zoomx); @@ -7108,7 +7108,7 @@ static bool ui_numedit_but_CURVEPROFILE(uiBlock *block, changed = true; #ifdef USE_CONT_MOUSE_CORRECT /* note: using 'cmp_last' is weak since there may be multiple points selected, - * but in practice this isnt really an issue */ + * but in practice this isn't really an issue */ if (ui_but_is_cursor_warp(but)) { /* OK but can go outside bounds */ data->ungrab_mval[0] = but->rect.xmin + ((last_x - profile->view_rect.xmin) * zoomx); @@ -8617,7 +8617,7 @@ void ui_but_activate_event(bContext *C, ARegion *region, uiBut *but) * Simulate moving the mouse over a button (or navigating to it with arrow keys). * * exported so menus can start with a highlighted button, - * even if the mouse isnt over it + * even if the mouse isn't over it */ void ui_but_activate_over(bContext *C, ARegion *region, uiBut *but) { diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index e4d06dca8cf..5a2ef1c6556 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2341,7 +2341,7 @@ void OBJECT_OT_make_local(wmOperatorType *ot) static bool make_override_library_object_overridable_check(Main *bmain, Object *object) { - /* An object is actually overrideable only if it is in at least one local collections. + /* An object is actually overridable only if it is in at least one local collection. * Unfortunately 'direct link' flag is not enough here. */ LISTBASE_FOREACH (Collection *, collection, &bmain->collections) { if (!ID_IS_LINKED(collection) && BKE_collection_has_object(collection, object)) { diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index 1069f942a7a..5ae952738c9 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -363,7 +363,7 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R } } else { - /* shouldnt suddenly give errors mid-render but possible */ + /* shouldn't suddenly give errors mid-render but possible */ char err_out[256] = "unknown"; ImBuf *ibuf_view; const int alpha_mode = (draw_sky) ? R_ADDSKY : R_ALPHAPREMUL; diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index 537d8849372..c1dcf2e56d3 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -554,7 +554,7 @@ static void draw_background(FileLayout *layout, View2D *v2d) for (i = 2; (i <= layout->rows + 1); i += 2) { sy = (int)v2d->cur.ymax - layout->offset_top - i * item_height - layout->tile_border_y; - /* Offsett pattern slightly to add scroll effect. */ + /* Offset pattern slightly to add scroll effect. */ sy += round_fl_to_int(item_height * (v2d->tot.ymax - v2d->cur.ymax) / item_height); immRectf(pos, diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 82cc499c729..26441bde6b6 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -393,7 +393,7 @@ static void view3d_main_region_init(wmWindowManager *wm, ARegion *region) keymap = WM_keymap_ensure(wm->defaultconf, "Paint Vertex Selection (Weight, Vertex)", 0, 0); WM_event_add_keymap_handler(®ion->handlers, keymap); - /* Before 'Weight/Vertex Paint' so adding curve points is not overriden. */ + /* Before 'Weight/Vertex Paint' so adding curve points is not overridden. */ keymap = WM_keymap_ensure(wm->defaultconf, "Paint Curve", 0, 0); WM_event_add_keymap_handler(®ion->handlers, keymap); diff --git a/source/blender/editors/transform/transform_convert_sequencer.c b/source/blender/editors/transform/transform_convert_sequencer.c index 7ec793f24bd..22b1f9fd8d7 100644 --- a/source/blender/editors/transform/transform_convert_sequencer.c +++ b/source/blender/editors/transform/transform_convert_sequencer.c @@ -845,7 +845,7 @@ void special_aftertrans_update__sequencer(bContext *UNUSED(C), TransInfo *t) /* Marker transform, not especially nice but we may want to move markers * at the same time as strips in the Video Sequencer. */ if (sseq->flag & SEQ_MARKER_TRANS) { - /* cant use TFM_TIME_EXTEND + /* can't use TFM_TIME_EXTEND * for some reason EXTEND is changed into TRANSLATE, so use frame_side instead */ if (t->mode == TFM_SEQ_SLIDE) { diff --git a/source/blender/freestyle/intern/python/BPy_Operators.cpp b/source/blender/freestyle/intern/python/BPy_Operators.cpp index 5fd02e4a9dd..d911e7db447 100644 --- a/source/blender/freestyle/intern/python/BPy_Operators.cpp +++ b/source/blender/freestyle/intern/python/BPy_Operators.cpp @@ -260,8 +260,8 @@ PyDoc_STRVAR(Operators_sequential_split_doc, "\n" " .. tip::\n" "\n" - " By specifiying a starting and stopping predicate allows\n" - " the chains to overlapp rather than chains partitioning.\n" + " By specifying a starting and stopping predicate allows\n" + " the chains to overlap rather than chains partitioning.\n" "\n" " :arg starting_pred: The predicate on a point that expresses the\n" " starting condition. Each time this condition is verified, a new chain begins\n" diff --git a/source/blender/freestyle/intern/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h index 1c959c43481..47a2e98418a 100644 --- a/source/blender/freestyle/intern/view_map/ViewMap.h +++ b/source/blender/freestyle/intern/view_map/ViewMap.h @@ -228,7 +228,7 @@ class ViewMap { */ ViewVertex *InsertViewVertex(SVertex *iVertex, vector &newViewEdges); - /* connects a FEdge to the graph trough a SVertex */ + /* connects a FEdge to the graph through a SVertex */ // FEdge *Connect(FEdge *ioEdge, SVertex *ioVertex); /* Clean temporary FEdges created by chaining */ @@ -1085,13 +1085,13 @@ class ViewEdge : public Interface1D { return __B; } - /*! Returns the first FEdge that constitues this ViewEdge. */ + /*! Returns the first FEdge that constitutes this ViewEdge. */ inline FEdge *fedgeA() { return _FEdgeA; } - /*! Returns the last FEdge that constitues this ViewEdge. */ + /*! Returns the last FEdge that constitutes this ViewEdge. */ inline FEdge *fedgeB() { return _FEdgeB; diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h index be418c15060..018e192bf37 100644 --- a/source/blender/gpu/GPU_batch.h +++ b/source/blender/gpu/GPU_batch.h @@ -128,7 +128,7 @@ void GPU_batch_program_set_builtin_with_config(GPUBatch *batch, eGPUShaderConfig sh_cfg); /* Will only work after setting the batch program. */ -/* TODO(fclem): Theses needs to be replaced by GPU_shader_uniform_* with explicit shader. */ +/* TODO(fclem): These need to be replaced by GPU_shader_uniform_* with explicit shader. */ #define GPU_batch_uniform_1i(batch, name, x) GPU_shader_uniform_1i((batch)->shader, name, x); #define GPU_batch_uniform_1b(batch, name, x) GPU_shader_uniform_1b((batch)->shader, name, x); #define GPU_batch_uniform_1f(batch, name, x) GPU_shader_uniform_1f((batch)->shader, name, x); diff --git a/source/blender/gpu/opengl/gl_backend.cc b/source/blender/gpu/opengl/gl_backend.cc index a1b7aba1140..ef7788194a1 100644 --- a/source/blender/gpu/opengl/gl_backend.cc +++ b/source/blender/gpu/opengl/gl_backend.cc @@ -308,7 +308,7 @@ static void detect_workarounds() if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_WIN, GPU_DRIVER_OFFICIAL) && !GLEW_VERSION_4_5) { GLContext::copy_image_support = false; } - /* Special fix for theses specific GPUs. + /* Special fix for these specific GPUs. * Without this workaround, blender crashes on startup. (see T72098) */ if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_WIN, GPU_DRIVER_OFFICIAL) && (strstr(renderer, "HD Graphics 620") || strstr(renderer, "HD Graphics 630"))) { diff --git a/source/blender/gpu/opengl/gl_context.hh b/source/blender/gpu/opengl/gl_context.hh index b8d979e8f0e..0222adaba25 100644 --- a/source/blender/gpu/opengl/gl_context.hh +++ b/source/blender/gpu/opengl/gl_context.hh @@ -43,7 +43,7 @@ class GLVaoCache; class GLSharedOrphanLists { public: - /** Mutex for the bellow structures. */ + /** Mutex for the below structures. */ std::mutex lists_mutex; /** Buffers and textures are shared across context. Any context can free them. */ Vector textures; @@ -92,7 +92,7 @@ class GLContext : public Context { */ Set vao_caches_; Set framebuffers_; - /** Mutex for the bellow structures. */ + /** Mutex for the below structures. */ std::mutex lists_mutex_; /** VertexArrays and framebuffers are not shared across context. */ Vector orphaned_vertarrays_; diff --git a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl index fb512a1f00e..81e0965fad3 100644 --- a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl @@ -57,7 +57,7 @@ in float dummy; vec2 do_widget(void) { - /* Offset to avoid loosing pixels (mimics conservative rasterization). */ + /* Offset to avoid losing pixels (mimics conservative rasterization). */ const vec2 ofs = vec2(0.5, -0.5); lineWidth = abs(rect.x - recti.x); vec2 emboss_ofs = vec2(0.0, -lineWidth); diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index e373500a0ed..91e0bc0ffa1 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -289,7 +289,7 @@ typedef struct Brush { int curve_preset; - /* Maximun distance to search fake neighbors from a vertex. */ + /* Maximum distance to search fake neighbors from a vertex. */ float disconnected_distance_max; int deform_target; diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h index 467174c4f32..1eff7be3f15 100644 --- a/source/blender/makesdna/DNA_cloth_types.h +++ b/source/blender/makesdna/DNA_cloth_types.h @@ -166,7 +166,7 @@ typedef struct ClothSimSettings { /** Mechanical damping of shear springs. */ float shear_damp; - /** The maximum lenght an internal spring can have during creation. */ + /** The maximum length an internal spring can have during creation. */ float internal_spring_max_length; /** How much the interal spring can diverge from the vertex normal during creation. */ float internal_spring_max_diversion; diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h index 1f7283a1c70..b2d62e0a5f6 100644 --- a/source/blender/makesdna/DNA_gpencil_modifier_types.h +++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h @@ -182,7 +182,7 @@ typedef struct ThickGpencilModifierData { int flag; /** Relative thickness factor. */ float thickness_fac; - /** Absolute thickness overide. */ + /** Absolute thickness override. */ int thickness; /** Custom index for passes. */ int layer_pass; diff --git a/source/blender/makesdna/DNA_modifier_defaults.h b/source/blender/makesdna/DNA_modifier_defaults.h index 860a9affb3e..9335c360363 100644 --- a/source/blender/makesdna/DNA_modifier_defaults.h +++ b/source/blender/makesdna/DNA_modifier_defaults.h @@ -236,7 +236,7 @@ .flag = 0, \ } -/* Defines are scattered accross too many files, they need to be moved to DNA. */ +/* Defines are scattered across too many files, they need to be moved to DNA. */ #if 0 #define _DNA_DEFAULT_DataTransferModifierData \ { \ diff --git a/source/blender/makesrna/intern/rna_access_compare_override.c b/source/blender/makesrna/intern/rna_access_compare_override.c index 2d6f1bbc059..d6305388cf9 100644 --- a/source/blender/makesrna/intern/rna_access_compare_override.c +++ b/source/blender/makesrna/intern/rna_access_compare_override.c @@ -134,7 +134,7 @@ bool RNA_property_overridable_get(PointerRNA *ptr, PropertyRNA *prop) /* Special handling for insertions of constraints or modifiers... */ /* TODO Note We may want to add a more generic system to RNA * (like a special property in struct of items) - * if we get more overrideable collections, + * if we get more overridable collections, * for now we can live with those special-cases handling I think. */ if (RNA_struct_is_a(ptr->type, &RNA_Constraint)) { bConstraint *con = ptr->data; diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c index d162917ea0c..f92a2932f06 100644 --- a/source/blender/makesrna/intern/rna_mesh_api.c +++ b/source/blender/makesrna/intern/rna_mesh_api.c @@ -288,7 +288,7 @@ void RNA_api_mesh(StructRNA *srna) "Define custom split normals of this mesh " "(use zero-vectors to keep auto ones)"); RNA_def_function_flag(func, FUNC_USE_REPORTS); - /* TODO, see how array size of 0 works, this shouldnt be used */ + /* TODO, see how array size of 0 works, this shouldn't be used */ parm = RNA_def_float_array(func, "normals", 1, NULL, -1.0f, 1.0f, "", "Normals", 0.0f, 0.0f); RNA_def_property_multi_array(parm, 2, normals_array_dim); RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED); @@ -301,7 +301,7 @@ void RNA_api_mesh(StructRNA *srna) "Define custom split normals of this mesh, from vertices' normals " "(use zero-vectors to keep auto ones)"); RNA_def_function_flag(func, FUNC_USE_REPORTS); - /* TODO, see how array size of 0 works, this shouldnt be used */ + /* TODO, see how array size of 0 works, this shouldn't be used */ parm = RNA_def_float_array(func, "normals", 1, NULL, -1.0f, 1.0f, "", "Normals", 0.0f, 0.0f); RNA_def_property_multi_array(parm, 2, normals_array_dim); RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED); diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 5dbc574d073..c67a3e4448b 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -5381,7 +5381,7 @@ static void def_sh_tex_pointdensity(StructRNA *srna) func = RNA_def_function(srna, "calc_point_density", "rna_ShaderNodePointDensity_density_calc"); RNA_def_function_ui_description(func, "Calculate point density"); RNA_def_pointer(func, "depsgraph", "Depsgraph", "", ""); - /* TODO, See how array size of 0 works, this shouldnt be used. */ + /* TODO, See how array size of 0 works, this shouldn't be used. */ parm = RNA_def_float_array(func, "rgba_values", 1, NULL, 0, 0, "", "RGBA Values", 0, 0); RNA_def_parameter_flags(parm, PROP_DYNAMIC, 0); RNA_def_function_output(func, parm); diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index bcdc38a1a3b..1eb5ed3977a 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -2122,7 +2122,7 @@ static void rna_def_vertex_group(BlenderRNA *brna) func = RNA_def_function(srna, "add", "rna_VertexGroup_vertex_add"); RNA_def_function_ui_description(func, "Add vertices to the group"); RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID); - /* TODO, see how array size of 0 works, this shouldnt be used */ + /* TODO, see how array size of 0 works, this shouldn't be used */ parm = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index List", 0, 0); RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED); parm = RNA_def_float(func, "weight", 0, 0.0f, 1.0f, "", "Vertex weight", 0.0f, 1.0f); @@ -2133,7 +2133,7 @@ static void rna_def_vertex_group(BlenderRNA *brna) func = RNA_def_function(srna, "remove", "rna_VertexGroup_vertex_remove"); RNA_def_function_ui_description(func, "Remove a vertex from the group"); RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID); - /* TODO, see how array size of 0 works, this shouldnt be used */ + /* TODO, see how array size of 0 works, this shouldn't be used */ parm = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index List", 0, 0); RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED); @@ -2180,14 +2180,14 @@ static void rna_def_face_map(BlenderRNA *brna) func = RNA_def_function(srna, "add", "rna_FaceMap_face_add"); RNA_def_function_ui_description(func, "Add vertices to the group"); RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID); - /* TODO, see how array size of 0 works, this shouldnt be used */ + /* TODO, see how array size of 0 works, this shouldn't be used */ parm = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index List", 0, 0); RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED); func = RNA_def_function(srna, "remove", "rna_FaceMap_face_remove"); RNA_def_function_ui_description(func, "Remove a vertex from the group"); RNA_def_function_flag(func, FUNC_USE_REPORTS | FUNC_USE_SELF_ID); - /* TODO, see how array size of 0 works, this shouldnt be used */ + /* TODO, see how array size of 0 works, this shouldn't be used */ parm = RNA_def_int_array(func, "index", 1, NULL, 0, 0, "", "Index List", 0, 0); RNA_def_parameter_flags(parm, PROP_DYNAMIC, PARM_REQUIRED); } diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index e4d2536eb91..2156516b187 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -439,7 +439,7 @@ const EnumPropertyItem rna_enum_clip_editor_mode_items[] = { {0, NULL, 0, NULL, NULL}, }; -/* Actually populated dynamically trough a function, +/* Actually populated dynamically through a function, * but helps for context-less access (e.g. doc, i18n...). */ static const EnumPropertyItem buttons_context_items[] = { {BCONTEXT_TOOL, "TOOL", ICON_TOOL_SETTINGS, "Tool", "Active Tool and Workspace settings"}, diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c index 357cfb562a7..99011c5e351 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.c +++ b/source/blender/modifiers/intern/MOD_surfacedeform.c @@ -437,13 +437,13 @@ BLI_INLINE int isPolyValid(const float coords[][2], const uint nr) for (int i = 0; i < nr; i++) { sub_v2_v2v2(curr_vec, coords[i], prev_co); - /* Check ovelap between directly adjacent vertices. */ + /* Check overlap between directly adjacent vertices. */ const float curr_len = normalize_v2(curr_vec); if (curr_len < FLT_EPSILON) { return MOD_SDEF_BIND_RESULT_OVERLAP_ERR; } - /* Check ovelap between vertices skipping one. */ + /* Check overlap between vertices skipping one. */ if (len_squared_v2v2(prev_prev_co, coords[i]) < FLT_EPSILON * FLT_EPSILON) { return MOD_SDEF_BIND_RESULT_OVERLAP_ERR; } diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index 22c7a394906..e9499818f64 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -293,7 +293,7 @@ static int bpy_bmesh_select_mode_set(BPy_BMesh *self, PyObject *value) return -1; } if (flag == 0) { - PyErr_SetString(PyExc_TypeError, "bm.select_mode: cant assignt an empty value"); + PyErr_SetString(PyExc_TypeError, "bm.select_mode: can't assign an empty value"); return -1; } diff --git a/source/blender/render/intern/pipeline.c b/source/blender/render/intern/pipeline.c index 6e15066575c..0a8b8f24614 100644 --- a/source/blender/render/intern/pipeline.c +++ b/source/blender/render/intern/pipeline.c @@ -1971,7 +1971,7 @@ void RE_RenderFrame(Render *re, if (write_still && !G.is_break) { if (BKE_imtype_is_movie(rd.im_format.imtype)) { /* operator checks this but in case its called from elsewhere */ - printf("Error: cant write single images with a movie format!\n"); + printf("Error: can't write single images with a movie format!\n"); } else { char name[FILE_MAX]; diff --git a/source/blender/sequencer/SEQ_render.h b/source/blender/sequencer/SEQ_render.h index 6f6d195126b..54584824da8 100644 --- a/source/blender/sequencer/SEQ_render.h +++ b/source/blender/sequencer/SEQ_render.h @@ -51,7 +51,7 @@ typedef struct SeqRenderData { bool is_proxy_render; bool is_prefetch_render; int view_id; - /* ID of task for asigning temp cache entries to particular task(thread, etc.) */ + /* ID of task for assigning temp cache entries to particular task(thread, etc.) */ eSeqTaskId task_id; /* special case for OpenGL render */ diff --git a/source/blender/sequencer/intern/image_cache.c b/source/blender/sequencer/intern/image_cache.c index 299ebffe8a8..290ee185865 100644 --- a/source/blender/sequencer/intern/image_cache.c +++ b/source/blender/sequencer/intern/image_cache.c @@ -166,7 +166,7 @@ typedef struct SeqCacheKey { float timeline_frame; /* Only for reference - used for freeing when cache is full. */ float cost; /* In short: render time(s) divided by playback frame duration(s) */ bool is_temp_cache; /* this cache entry will be freed before rendering next frame */ - /* ID of task for asigning temp cache entries to particular task(thread, etc.) */ + /* ID of task for assigning temp cache entries to particular task(thread, etc.) */ eSeqTaskId task_id; int type; } SeqCacheKey; diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index b11dae27d19..85611a0be93 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -346,7 +346,7 @@ static const char *wm_area_name(ScrArea *area) SPACE_NAME(SPACE_TOPBAR); SPACE_NAME(SPACE_STATUSBAR); default: - return "Unkown Space"; + return "Unknown Space"; } } diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 17f4713ff96..e132caede0d 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2099,7 +2099,7 @@ static int wm_handler_operator_call(bContext *C, handler->op = NULL; } - /* Putting back screen context, reval can pass trough after modal failures! */ + /* Putting back screen context, reval can pass through after modal failures! */ if ((retval & OPERATOR_PASS_THROUGH) || wm_event_always_pass(event)) { CTX_wm_area_set(C, area); CTX_wm_region_set(C, region); diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 8018ab3f46d..fd1d721d869 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -74,7 +74,7 @@ endif() if(WITH_TBB) blender_include_dirs(${TBB_INCLUDE_DIRS}) if(NOT APPLE) - # APPLE plaform uses full paths for linking libraries. + # APPLE platform uses full paths for linking libraries. link_directories(${LIBDIR}/tbb/lib) endif() endif()