From 8b2072868d5057bf9a3da52b8d27d13b11c8ae18 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 11 Mar 2020 21:39:56 +1100 Subject: Cleanup: spelling --- source/blender/blenkernel/BKE_shrinkwrap.h | 2 +- source/blender/blenkernel/intern/armature.c | 4 ++-- source/blender/blenkernel/intern/fluid.c | 6 +++--- source/blender/blenkernel/intern/pointcache.c | 4 ++-- source/blender/blenkernel/intern/tracking.c | 2 +- source/blender/draw/engines/gpencil/gpencil_cache_utils.c | 2 +- source/blender/draw/engines/gpencil/gpencil_draw_data.c | 2 +- source/blender/draw/engines/gpencil/gpencil_engine.c | 2 +- source/blender/draw/intern/DRW_render.h | 2 +- source/blender/draw/intern/draw_manager_exec.c | 2 +- source/blender/editors/animation/anim_ipo_utils.c | 3 +-- source/blender/editors/gpencil/gpencil_paint.c | 6 ++++-- source/blender/editors/gpencil/gpencil_vertex_paint.c | 5 ++--- source/blender/editors/mesh/editmesh_mask_extract.c | 2 +- source/blender/editors/mesh/meshtools.c | 2 +- source/blender/editors/transform/transform_mode_mirror.c | 8 +++----- source/blender/io/usd/intern/abstract_hierarchy_iterator.cc | 2 +- source/blender/io/usd/intern/abstract_hierarchy_iterator.h | 6 +++--- source/blender/io/usd/intern/usd_writer_mesh.cc | 2 +- source/blender/makesrna/intern/rna_particle.c | 10 +++++----- 20 files changed, 36 insertions(+), 38 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h index 5edde7441de..83129bed5f7 100644 --- a/source/blender/blenkernel/BKE_shrinkwrap.h +++ b/source/blender/blenkernel/BKE_shrinkwrap.h @@ -170,7 +170,7 @@ void BKE_shrinkwrap_snap_point_to_surface(const struct ShrinkwrapTreeData *tree, float r_point_co[3]); /* - * NULL initializers to local data + * NULL initializes to local data */ #define NULL_ShrinkwrapCalcData \ { \ diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 0580ad55e43..c23cb9231d7 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -1008,12 +1008,12 @@ void BKE_pchan_bbone_handles_compute(const BBoneSplineParameters *param, * - These properties allow users to hand-animate the * bone curve/shape, without having to resort to using * extra bones - * - The "bone" level offsets are for defining the restpose + * - The "bone" level offsets are for defining the rest-pose * shape of the bone (e.g. for curved eyebrows for example). * -> In the viewport, it's needed to define what the rest pose * looks like * -> For "rest == 0", we also still need to have it present - * so that we can "cancel out" this restpose when it comes + * so that we can "cancel out" this rest-pose when it comes * time to deform some geometry, it won't cause double transforms. * - The "pchan" level offsets are the ones that animators actually * end up animating diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index 03c9cc7d151..9919a0d7385 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -2741,7 +2741,7 @@ static void update_flowsfluids(struct Depsgraph *depsgraph, } /* Optimization: Static liquid flow objects don't need emission computation after first * frame. - * TODO (sebbas): Also do not use static mode if inital velocities are enabled. */ + * TODO (sebbas): Also do not use static mode if initial velocities are enabled. */ if (mfs->type == FLUID_FLOW_TYPE_LIQUID && is_static && !is_first_frame && !use_velocity) { continue; } @@ -2961,7 +2961,7 @@ static void update_flowsfluids(struct Depsgraph *depsgraph, if (is_liquid && !is_first_frame) { /* Skip static liquid objects that are not on the first frame. - * TODO (sebbas): Also do not use static mode if inital velocities are enabled. */ + * TODO (sebbas): Also do not use static mode if initial velocities are enabled. */ if (is_static && !use_velocity) { continue; } @@ -3222,7 +3222,7 @@ static Mesh *create_liquid_geometry(FluidDomainSettings *mds, Mesh *orgmesh, Obj float cell_size_scaled[3]; /* Assign material + flags to new mesh. - * If there are no faces in original mesj, keep materials and flags unchanged. */ + * If there are no faces in original mesh, keep materials and flags unchanged. */ MPoly *mpoly; MPoly mp_example = {0}; mpoly = orgmesh->mpoly; diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 90a4a2dee23..b0163436cc4 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -1953,8 +1953,8 @@ static bool foreach_object_ptcache( if (!foreach_object_modifier_ptcache(object, callback, callback_user_data)) { return false; } - /* Consider all object in dupli groups to be part of the same object, - * for baking with linking dupligroups. Once we have better overrides + /* Consider all object in dupli-groups to be part of the same object, + * for baking with linking dupli-groups. Once we have better overrides * this can be revisited so users select the local objects directly. */ if (scene != NULL && (duplis-- > 0) && (object->instance_collection != NULL)) { FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN (object->instance_collection, current_object) { diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index f1243330567..a9bd1d17567 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -621,7 +621,7 @@ MovieTrackingTrack *BKE_tracking_track_duplicate(MovieTrackingTrack *track) new_track->markers = MEM_dupallocN(new_track->markers); - /* Orevent duplicate from being used for 2D stabilization. + /* Prevent duplicate from being used for 2D stabilization. * If necessary, it shall be added explicitly. */ new_track->flag &= ~TRACK_USE_2D_STAB; diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c index 743171b09fb..3459685f504 100644 --- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.c +++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.c @@ -61,7 +61,7 @@ GPENCIL_tObject *gpencil_object_cache_add(GPENCIL_PrivateData *pd, Object *ob) /* TODO: This does not work quite well if you use * strokes not aligned with the object axes. Maybe we could try to * compute the minimum axis of all strokes. But this would be more - * computationaly heavy and should go into the GPData evaluation. */ + * computationally heavy and should go into the GPData evaluation. */ BoundBox *bbox = BKE_object_boundbox_get(ob); /* Convert bbox to matrix */ float mat[4][4], size[3], center[3]; diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_data.c b/source/blender/draw/engines/gpencil/gpencil_draw_data.c index 77baadfc83a..625af8cec6f 100644 --- a/source/blender/draw/engines/gpencil/gpencil_draw_data.c +++ b/source/blender/draw/engines/gpencil/gpencil_draw_data.c @@ -108,7 +108,7 @@ static void gpencil_object_random_color_get(const Object *ob, float r_color[3]) static void gpencil_shade_color(float color[3]) { - /* This is scene refered color, not gamma corrected and not per perceptual. + /* This is scene refereed color, not gamma corrected and not per perceptual. * So we lower the threshold a bit. (1.0 / 3.0) */ if (color[0] + color[1] + color[2] > 1.1) { add_v3_fl(color, -0.25f); diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c index d47d6f8a836..37aef5a633a 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.c +++ b/source/blender/draw/engines/gpencil/gpencil_engine.c @@ -710,7 +710,7 @@ void GPENCIL_cache_finish(void *ved) if (pd->use_mask_fb) { /* We need an extra depth to not disturb the normal drawing. - * The color_tx is needed for framebuffer cmpleteness. */ + * The color_tx is needed for frame-buffer completeness. */ GPUTexture *color_tx, *depth_tx; depth_tx = DRW_texture_pool_query_2d( size[0], size[1], GPU_DEPTH24_STENCIL8, &draw_engine_gpencil_type); diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index cc257b80daf..904510b1357 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -407,7 +407,7 @@ void DRW_shgroup_state_disable(DRWShadingGroup *shgroup, DRWState state); /* Reminders: * - (compare_mask & reference) is what is tested against (compare_mask & stencil_value) * stencil_value being the value stored in the stencil buffer. - * - (writemask & reference) is what gets written if the test condition is fullfiled. + * - (write-mask & reference) is what gets written if the test condition is fulfilled. **/ void DRW_shgroup_stencil_set(DRWShadingGroup *shgroup, uint write_mask, diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index 85525ea7b55..87a475cb134 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -402,7 +402,7 @@ static void drw_stencil_state_set(uint write_mask, uint reference, uint compare_ /* Reminders: * - (compare_mask & reference) is what is tested against (compare_mask & stencil_value) * stencil_value being the value stored in the stencil buffer. - * - (writemask & reference) is what gets written if the test condition is fullfiled. + * - (write-mask & reference) is what gets written if the test condition is fulfilled. **/ glStencilMask(write_mask); diff --git a/source/blender/editors/animation/anim_ipo_utils.c b/source/blender/editors/animation/anim_ipo_utils.c index 5b729c856c0..f631d08f3e4 100644 --- a/source/blender/editors/animation/anim_ipo_utils.c +++ b/source/blender/editors/animation/anim_ipo_utils.c @@ -177,8 +177,7 @@ int getname_anim_fcurve(char *name, ID *id, FCurve *fcu) icon = RNA_struct_ui_icon(ptr.type); /* valid path - remove the invalid tag since we now know how to use it saving - * users manual effort to reenable using "Revive Disabled FCurves" [#29629] - */ + * users manual effort to re-enable using "Revive Disabled FCurves" T29629. */ fcu->flag &= ~FCURVE_DISABLED; } else { diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 56351fbfb9a..46788eba370 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -3280,8 +3280,10 @@ static void gpencil_add_guide_points(const tGPsdata *p, } } -/* Add fake points for missing mouse movements when the artist draw very fast creating an arc - * with the vertice in the midle of the segment and using the angle of the previous segment. */ +/** + * Add fake points for missing mouse movements when the artist draw very fast creating an arc + * with the vertex in the middle of the segment and using the angle of the previous segment. + */ static void gpencil_add_fake_points(const wmEvent *event, tGPsdata *p) { Brush *brush = p->brush; diff --git a/source/blender/editors/gpencil/gpencil_vertex_paint.c b/source/blender/editors/gpencil/gpencil_vertex_paint.c index 5b5a306aa25..c730d1b493e 100644 --- a/source/blender/editors/gpencil/gpencil_vertex_paint.c +++ b/source/blender/editors/gpencil/gpencil_vertex_paint.c @@ -1099,10 +1099,9 @@ static bool gp_vertexpaint_brush_apply_to_layers(bContext *C, tGP_BrushVertexpai LISTBASE_FOREACH (bGPDframe *, gpf, &gpl->frames) { /* Always do active frame; Otherwise, only include selected frames */ if ((gpf == gpl->actframe) || (gpf->flag & GP_FRAME_SELECT)) { - /* compute multiframe falloff factor */ + /* Compute multi-frame falloff factor. */ if (gso->use_multiframe_falloff) { - /* Faloff depends on distance to active frame (relative to the overall frame range) - */ + /* Falloff depends on distance to active frame (relative to the overall frame range) */ gso->mf_falloff = BKE_gpencil_multiframe_falloff_calc( gpf, gpl->actframe->framenum, f_init, f_end, ts->gp_sculpt.cur_falloff); } diff --git a/source/blender/editors/mesh/editmesh_mask_extract.c b/source/blender/editors/mesh/editmesh_mask_extract.c index d688e2cb658..1c4bc33240a 100644 --- a/source/blender/editors/mesh/editmesh_mask_extract.c +++ b/source/blender/editors/mesh/editmesh_mask_extract.c @@ -349,7 +349,7 @@ static int paint_mask_slice_exec(bContext *C, wmOperator *op) if (ob->mode == OB_MODE_SCULPT) { ED_sculpt_undo_geometry_begin(ob, "mask slice"); /* TODO: The ideal functionality would be to preserve the current face sets and add a new one - * for the new triangles, but this datalayer needs to be rebuild in order to make sculpt mode + * for the new triangles, but this data-layer needs to be rebuild in order to make sculpt mode * not crash when modifying the geometry. */ CustomData_free_layers(&mesh->pdata, CD_SCULPT_FACE_SETS, mesh->totpoly); } diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index dc825871bb7..8f31fa0a1fa 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -943,7 +943,7 @@ BMVert *editbmesh_get_x_mirror_vert(Object *ob, } /** - * Wrapper for objectmode/editmode. + * Wrapper for object-mode/edit-mode. * * call #BM_mesh_elem_table_ensure first for editmesh. */ diff --git a/source/blender/editors/transform/transform_mode_mirror.c b/source/blender/editors/transform/transform_mode_mirror.c index 752d482fae2..2f305989f82 100644 --- a/source/blender/editors/transform/transform_mode_mirror.c +++ b/source/blender/editors/transform/transform_mode_mirror.c @@ -50,11 +50,9 @@ static void applyMirror(TransInfo *t, const int UNUSED(mval[2])) char str[UI_MAX_DRAW_STR]; copy_v3_v3(t->values_final, t->values); - /* - * OPTIMIZATION: - * This still recalcs transformation on mouse move - * while it should only recalc on constraint change - * */ + /* OPTIMIZATION: + * This still recalculates transformation on mouse move + * while it should only recalculate on constraint change. */ /* if an axis has been selected */ if (t->con.mode & CON_APPLY) { diff --git a/source/blender/io/usd/intern/abstract_hierarchy_iterator.cc b/source/blender/io/usd/intern/abstract_hierarchy_iterator.cc index a8ed2c5f2a5..b473743fe16 100644 --- a/source/blender/io/usd/intern/abstract_hierarchy_iterator.cc +++ b/source/blender/io/usd/intern/abstract_hierarchy_iterator.cc @@ -345,7 +345,7 @@ void AbstractHierarchyIterator::visit_dupli_object(DupliObject *dupli_object, } else { /* The parent object is NOT part of the duplicated collection. This means that the world - * transform of this dupliobject can be influenced by objects that are not part of its + * transform of this dupli-object can be influenced by objects that are not part of its * export graph. */ animation_check_include_parent = true; context->export_parent = duplicator; diff --git a/source/blender/io/usd/intern/abstract_hierarchy_iterator.h b/source/blender/io/usd/intern/abstract_hierarchy_iterator.h index 8bca2ddd447..c121e3b704d 100644 --- a/source/blender/io/usd/intern/abstract_hierarchy_iterator.h +++ b/source/blender/io/usd/intern/abstract_hierarchy_iterator.h @@ -65,8 +65,8 @@ struct HierarchyContext { /* When weak_export=true, the object will be exported only as transform, and only if is an * ancestor of an object with weak_export=false. * - * In other words: when weak_export=true but this object has no children, or all decendants also - * have weak_export=true, this object (and by recursive reasoning all its decendants) will be + * In other words: when weak_export=true but this object has no children, or all descendants also + * have weak_export=true, this object (and by recursive reasoning all its descendants) will be * excluded from the export. * * The export hierarchy is kept as close to the the hierarchy in Blender as possible. As such, an @@ -222,7 +222,7 @@ class AbstractHierarchyIterator { * * When this returns true, only a transform writer is created and marked as * 'weak export'. In this case, the transform writer will be removed before - * exporting starts, unless a decendant of this object is to be exported. + * exporting starts, unless a descendant of this object is to be exported. * Dupli-object generated from this object will also be skipped. * * See HierarchyContext::weak_export. diff --git a/source/blender/io/usd/intern/usd_writer_mesh.cc b/source/blender/io/usd/intern/usd_writer_mesh.cc index 74005afaf31..cbf51fc15b3 100644 --- a/source/blender/io/usd/intern/usd_writer_mesh.cc +++ b/source/blender/io/usd/intern/usd_writer_mesh.cc @@ -58,7 +58,7 @@ bool USDGenericMeshWriter::is_supported(const HierarchyContext *context) const int base_flag; if (is_dupli) { - /* Construct the object's base flags from its dupliparent, just like is done in + /* Construct the object's base flags from its dupli-parent, just like is done in * deg_objects_dupli_iterator_next(). Without this, the visibility check below will fail. Doing * this here, instead of a more suitable location in AbstractHierarchyIterator, prevents * copying the Object for every dupli. */ diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 9aeaf4e83dd..3747dd53b97 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -188,9 +188,9 @@ static void rna_ParticleHairKey_location_object_info(PointerRNA *ptr, * not a very efficient way of getting hair key location data, * but it's the best we've got at the present * - * IDEAS: include additional information in pointerRNA beforehand, - * for example a pointer to the ParticleStstemModifierData to which the - * hairkey belongs. + * IDEAS: include additional information in PointerRNA beforehand, + * for example a pointer to the ParticleSystemModifierData to which the + * hair-key belongs. */ for (md = ob->modifiers.first; md; md = md->next) { @@ -199,9 +199,9 @@ static void rna_ParticleHairKey_location_object_info(PointerRNA *ptr, if (psmd && psmd->mesh_final && psmd->psys) { psys = psmd->psys; for (i = 0, pa = psys->particles; i < psys->totpart; i++, pa++) { - /* hairkeys are stored sequentially in memory, so we can + /* Hair-keys are stored sequentially in memory, so we can * find if it's the same particle by comparing pointers, - * without having to iterate over them all */ + * without having to iterate over them all. */ if ((hkey >= pa->hair) && (hkey < pa->hair + pa->totkey)) { *psmd_pt = psmd; *pa_pt = pa; -- cgit v1.2.3