Commit: 263371dc4e217ab38ee30fcb210e3c342c6c60ec Author: Campbell Barton Date: Tue Jun 7 14:53:20 2022 +1000 Branches: master https://developer.blender.org/rB263371dc4e217ab38ee30fcb210e3c342c6c60ec
Cleanup: spelling in comments, additional white space =================================================================== M intern/cycles/blender/image.cpp M intern/cycles/session/denoising.cpp M source/blender/blenkernel/intern/DerivedMesh.cc M source/blender/blenkernel/intern/idprop.c M source/blender/blenkernel/intern/lib_remap.c M source/blender/blenkernel/intern/linestyle.c M source/blender/blenkernel/intern/paint.c M source/blender/blenkernel/intern/particle_system.c M source/blender/blenkernel/intern/pointcache.c M source/blender/blenkernel/intern/subdiv_eval.c M source/blender/blenkernel/intern/tracking_stabilize.c M source/blender/blenlib/BLI_ghash.h M source/blender/blenlib/BLI_math_color.h M source/blender/blenlib/intern/hash_md5.c M source/blender/blenloader/intern/versioning_280.c M source/blender/blenloader/intern/versioning_290.c M source/blender/draw/engines/eevee/eevee_private.h M source/blender/draw/intern/DRW_render.h M source/blender/editors/animation/anim_channels_defines.c M source/blender/editors/animation/drivers.c M source/blender/gpu/GPU_texture.h M source/blender/imbuf/IMB_imbuf_types.h M source/blender/imbuf/intern/IMB_filetype.h M source/blender/imbuf/intern/tiff.c M source/blender/io/collada/MeshImporter.h M source/blender/io/stl/importer/stl_import_ascii_reader.hh M source/blender/io/usd/tests/usd_tests_common.h M source/blender/makesdna/DNA_cloth_types.h M source/blender/makesdna/DNA_object_types.h M source/blender/modifiers/intern/MOD_array.c M source/blender/render/RE_pipeline.h M source/blender/windowmanager/intern/wm_cursors.c M source/blender/windowmanager/intern/wm_init_exit.c M source/blender/windowmanager/intern/wm_playanim.c =================================================================== diff --git a/intern/cycles/blender/image.cpp b/intern/cycles/blender/image.cpp index 058fe3d46ac..aea79ad60ad 100644 --- a/intern/cycles/blender/image.cpp +++ b/intern/cycles/blender/image.cpp @@ -31,7 +31,7 @@ bool BlenderImageLoader::load_metadata(const ImageDeviceFeatures &, ImageMetaDat if (b_image.source() != BL::Image::source_TILED) { /* Image sequence might have different dimensions, and hence needs to be handled in a special * manner. - * NOTE: Currently the sequences are not handled by this image laoder. */ + * NOTE: Currently the sequences are not handled by this image loader. */ assert(b_image.source() != BL::Image::source_SEQUENCE); metadata.width = b_image.size()[0]; diff --git a/intern/cycles/session/denoising.cpp b/intern/cycles/session/denoising.cpp index ff9ca1b4345..a9377d412e8 100644 --- a/intern/cycles/session/denoising.cpp +++ b/intern/cycles/session/denoising.cpp @@ -90,7 +90,7 @@ static vector<ChannelMapping> output_channels() return map; } -/* Renderlayer Handling */ +/* Render-layer Handling. */ bool DenoiseImageLayer::detect_denoising_channels() { diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc index 5cf0ca6e062..8496692ceb3 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.cc +++ b/source/blender/blenkernel/intern/DerivedMesh.cc @@ -628,14 +628,14 @@ static void mesh_calc_modifier_final_normals(const Mesh *mesh_input, /* without this, drawing ngon tri's faces will show ugly tessellated face * normals and will also have to calculate normals on the fly, try avoid * this where possible since calculating polygon normals isn't fast, - * note that this isn't a problem for subsurf (only quads) or editmode + * note that this isn't a problem for subsurf (only quads) or edit-mode * which deals with drawing differently. */ BKE_mesh_ensure_normals_for_display(mesh_final); } /* Some modifiers, like data-transfer, may generate those data as temp layer, * we do not want to keep them, as they are used by display code when available - * (i.e. even if autosmooth is disabled). */ + * (i.e. even if auto-smooth is disabled). */ if (CustomData_has_layer(&mesh_final->ldata, CD_NORMAL)) { CustomData_free_layers(&mesh_final->ldata, CD_NORMAL, mesh_final->totloop); } diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index e99230ef523..35f02c29a00 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -168,7 +168,7 @@ void IDP_ResizeIDPArray(IDProperty *prop, int newlen) /* NOTE: This code comes from python, here's the corresponding comment. */ /* This over-allocates proportional to the list size, making room - * for additional growth. The over-allocation is mild, but is + * for additional growth. The over-allocation is mild, but is * enough to give linear-time amortized behavior over a long * sequence of appends() in the presence of a poorly-performing * system realloc(). diff --git a/source/blender/blenkernel/intern/lib_remap.c b/source/blender/blenkernel/intern/lib_remap.c index 2600a40153c..246999a1179 100644 --- a/source/blender/blenkernel/intern/lib_remap.c +++ b/source/blender/blenkernel/intern/lib_remap.c @@ -454,7 +454,7 @@ static void libblock_remap_reset_remapping_status_callback(ID *old_id, * \param old_id: the data-block to dereference (may be NULL if \a id is non-NULL). * \param new_id: the new data-block to replace \a old_id references with (may be NULL). * \param r_id_remap_data: if non-NULL, the IDRemap struct to use - * (uselful to retrieve info about remapping process). + * (useful to retrieve info about remapping process). */ ATTR_NONNULL(1) static void libblock_remap_data(Main *bmain, diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index c0eb1955fdf..12a661d139b 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -55,7 +55,7 @@ static void linestyle_copy_data(Main *bmain, ID *id_dst, const ID *id_src, const FreestyleLineStyle *linestyle_dst = (FreestyleLineStyle *)id_dst; const FreestyleLineStyle *linestyle_src = (const FreestyleLineStyle *)id_src; - /* We never handle usercount here for own data. */ + /* We never handle user-count here for own data. */ const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT; /* We always need allocation of our private ID data. */ const int flag_private_id_data = flag & ~LIB_ID_CREATE_NO_ALLOCATE; diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index bb499f24c07..1016d91614b 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -2117,7 +2117,7 @@ void BKE_sculpt_ensure_orig_mesh_data(Scene *scene, Object *object) /* Copy the current mesh visibility to the Face Sets. */ BKE_sculpt_face_sets_ensure_from_base_mesh_visibility(mesh); if (object->sculpt != NULL) { - /* If a sculpt session is active, ensure we have its faceset data porperly up-to-date. */ + /* If a sculpt session is active, ensure we have its face-set data properly up-to-date. */ object->sculpt->face_sets = CustomData_get_layer(&mesh->pdata, CD_SCULPT_FACE_SETS); /* NOTE: In theory we could add that on the fly when required by sculpt code. diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index a7ab1536b1f..3ad770c5429 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3121,7 +3121,7 @@ static void collision_check(ParticleSimulationData *sim, int p, float dfra, floa col.cfra = cfra; col.old_cfra = sim->psys->cfra; - /* get acceleration (from gravity, forcefields etc. to be re-applied in collision response) */ + /* Get acceleration (from gravity, force-fields etc. to be re-applied in collision response). */ sub_v3_v3v3(col.acc, pa->state.vel, pa->prev_state.vel); mul_v3_fl(col.acc, 1.0f / col.total_time); @@ -4962,7 +4962,7 @@ void particle_system_update(struct Depsgraph *depsgraph, } /* Save matrix for duplicators, - * at rendertime the actual dupliobject's matrix is used so don't update! */ + * at render-time the actual dupli-object's matrix is used so don't update! */ invert_m4_m4(psys->imat, ob->obmat); BKE_particle_batch_cache_dirty_tag(psys, BKE_PARTICLE_BATCH_DIRTY_ALL); diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 2467ca16670..d7bdfe08ab9 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -3232,7 +3232,7 @@ void BKE_ptcache_bake(PTCacheBaker *baker) scene, pid->calldata, &cache->startframe, &cache->endframe); } - /* XXX workaround for regression inroduced in ee3fadd, needs looking into */ + /* XXX: workaround for regression introduced in ee3fadd, needs looking into. */ if (pid->type == PTCACHE_TYPE_RIGIDBODY) { if ((cache->flag & PTCACHE_REDO_NEEDED || (cache->flag & PTCACHE_SIMULATION_VALID) == 0) && diff --git a/source/blender/blenkernel/intern/subdiv_eval.c b/source/blender/blenkernel/intern/subdiv_eval.c index 1996273b681..fda833ffd27 100644 --- a/source/blender/blenkernel/intern/subdiv_eval.c +++ b/source/blender/blenkernel/intern/subdiv_eval.c @@ -247,7 +247,7 @@ bool BKE_subdiv_eval_refine_from_mesh(Subdiv *subdiv, } /* Set coordinates of base mesh vertices. */ set_coarse_positions(subdiv, mesh, coarse_vertex_cos); - /* Set face-varyign data to UV maps. */ + /* Set face-varying data to UV maps. */ const int num_uv_layers = CustomData_number_of_layers(&mesh->ldata, CD_MLOOPUV); for (int layer_index = 0; layer_index < num_uv_layers; layer_index++) { const MLoopUV *mloopuv = CustomData_get_layer_n(&mesh->ldata, CD_MLOOPUV, layer_index); diff --git a/source/blender/blenkernel/intern/tracking_stabilize.c b/source/blender/blenkernel/intern/tracking_stabilize.c index d86a0c10f01..e2e0b4227e3 100644 --- a/source/blender/blenkernel/intern/tracking_stabilize.c +++ b/source/blender/blenkernel/intern/tracking_stabilize.c @@ -362,7 +362,7 @@ static MovieTrackingMarker *get_tracking_data_point(StabContext *ctx, * * As a simple default, we use the weighted average of the location markers * of the current frame as pivot point. TODO: It is planned to add further - * options, like e.g. anchoring the pivot point at the canvas. Moreover, + * options, like e.g. anchoring the pivot point at the canvas. Moreover, * it is planned to allow for a user controllable offset. */ static void setup_pivot(const float ref_pos[2], float r_pivot[2]) diff --git a/source/blender/blenlib/BLI_ghash.h b/source/blender/blenlib/BLI_ghash.h index 7f90ec20b66..8743b135dff 100644 --- a/source/blender/blenlib/BLI_ghash.h +++ b/source/blender/blenlib/BLI_ghash.h @@ -562,7 +562,7 @@ bool BLI_ghashutil_ptrcmp(const void *a, const void *b); /** * This function implements the widely used `djb` hash apparently posted - * by Daniel Bernstein to `comp.lang.c` some time ago. The 32 bit + * by Daniel Bernstein to `comp.lang.c` some time ago. The 32 bit * unsigned hash value starts at 5381 and for each byte 'c' in the * string, is updated: `hash = hash * 33 + c`. * This function uses the signed value of each byte. diff --git a/source/blender/blenlib/BLI_math_color.h b/source/blender/blenlib/BLI_math_color.h index 64b820a22b0..6386a7f76f8 100644 --- a/source/blender/blenlib/BLI_math_color.h +++ b/source/blender/blenlib/BLI_math_color.h @@ -123,7 +123,7 @@ MINLINE void premul_float_to_straight_uchar(unsigned char *result, const float c * one of the primaries, it lies outside the color gamut * accessible from the given triple of primaries. Desaturate * it by adding white, equal quantities of R, G, and B, enough - * to make RGB all p @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs