From cdfaddbb1d426fb090c8abebdd0fa5bef236a011 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 10 Feb 2020 10:33:00 +1100 Subject: Cleanup: spelling --- source/blender/blenkernel/intern/fluid.c | 7 ++++--- source/blender/blenlib/intern/delaunay_2d.c | 2 +- source/blender/blenloader/intern/versioning_280.c | 2 +- source/blender/editors/animation/keyframes_edit.c | 6 +++--- source/blender/editors/armature/pose_slide.c | 2 +- source/blender/editors/interface/view2d.c | 4 ++-- source/blender/makesrna/intern/rna_scene_api.c | 2 +- source/blender/usd/intern/usd_writer_mesh.cc | 2 +- 8 files changed, 14 insertions(+), 13 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index 3de1902db6e..2f13210ca44 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -632,7 +632,7 @@ static void obstacles_from_mesh_task_cb(void *__restrict userdata, /* Distance between two opposing vertices in a unit cube. * I.e. the unit cube diagonal or sqrt(3). - * This value is our nearest neighbour search distance. */ + * This value is our nearest neighbor search distance. */ const float surface_distance = 1.732; for (int x = mds->res_min[0]; x < mds->res_max[0]; x++) { @@ -2219,7 +2219,7 @@ BLI_INLINE void apply_inflow_fields(FluidFlowSettings *mfs, } /* Set emission value for smoke inflow. - * Ensure that emission value is "maximised". */ + * Ensure that emission value is "maximized". */ if (emission_in) { emission_in[index] = MAX2(emission_value, emission_in[index]); } @@ -3402,7 +3402,8 @@ static void BKE_fluid_modifier_processDomain(FluidModifierData *mmd, resume_guide = (!is_startframe) && (mds->cache_frame_pause_guide == scene_framenr); bool read_cache, bake_cache; - read_cache = false, bake_cache = baking_data || baking_noise || baking_mesh || baking_particles || baking_guide; + read_cache = false, + bake_cache = baking_data || baking_noise || baking_mesh || baking_particles || baking_guide; bool with_gdomain; with_gdomain = (mds->guide_source == FLUID_DOMAIN_GUIDE_SRC_DOMAIN); diff --git a/source/blender/blenlib/intern/delaunay_2d.c b/source/blender/blenlib/intern/delaunay_2d.c index 118949d1c46..06c72a4c3d6 100644 --- a/source/blender/blenlib/intern/delaunay_2d.c +++ b/source/blender/blenlib/intern/delaunay_2d.c @@ -1735,7 +1735,7 @@ static bool can_collapse(const SymEdge *se) * edges may end up with zero or negative area (see can_collapse, above). * So don't choose a collapse direction that is not allowed or one that has an original vertex * as origin and a non-original vertex as destination. - * If both collapse directions are allowed by that rule, picke the one with the lower original + * If both collapse directions are allowed by that rule, pick the one with the lower original * index. * * After merging, the faces abc and adb disappear (if they are not the outer face). diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index d8541975f86..0d5de67feaa 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -1558,7 +1558,7 @@ void do_versions_after_linking_280(Main *bmain, ReportList *UNUSED(reports)) } } - /* This versionning could probably be done only on earlier versions, not sure however + /* This versioning could probably be done only on earlier versions, not sure however * which exact version fully deprecated tessfaces, so think we can keep that one here, no * harm to be expected anyway for being over-conservative. */ for (Mesh *me = bmain->meshes.first; me != NULL; me = me->id.next) { diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c index dc413e936eb..9c65d5fcd2d 100644 --- a/source/blender/editors/animation/keyframes_edit.c +++ b/source/blender/editors/animation/keyframes_edit.c @@ -501,7 +501,7 @@ void ANIM_editkeyframes_refresh(bAnimContext *ac) ok |= KEYFRAME_OK_KEY; \ \ if (ked && (ked->iterflags & KEYFRAME_ITER_INCL_HANDLES)) { \ - /* Only act on visible items, so check handle visiblity state. */ \ + /* Only act on visible items, so check handle visibility state. */ \ const bool handles_visible = ((ked->iterflags & KEYFRAME_ITER_HANDLES_DEFAULT_INVISIBLE) ? \ (BEZT_ISSEL_ANY(bezt)) : \ true); \ @@ -1459,7 +1459,7 @@ KeyframeEditFunc ANIM_editkeyframes_easing(short mode) static short select_bezier_add(KeyframeEditData *ked, BezTriple *bezt) { - /* Only act on visible items, so check handle visiblity state. */ + /* Only act on visible items, so check handle visibility state. */ const bool handles_visible = ked && ((ked->iterflags & KEYFRAME_ITER_HANDLES_DEFAULT_INVISIBLE) ? (BEZT_ISSEL_ANY(bezt)) : true); @@ -1485,7 +1485,7 @@ static short select_bezier_add(KeyframeEditData *ked, BezTriple *bezt) static short select_bezier_subtract(KeyframeEditData *ked, BezTriple *bezt) { - /* Only act on visible items, so check handle visiblity state. */ + /* Only act on visible items, so check handle visibility state. */ const bool handles_visible = ked && ((ked->iterflags & KEYFRAME_ITER_HANDLES_DEFAULT_INVISIBLE) ? (BEZT_ISSEL_ANY(bezt)) : true); diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c index 7ed41b5b4d0..4c64f9c7248 100644 --- a/source/blender/editors/armature/pose_slide.c +++ b/source/blender/editors/armature/pose_slide.c @@ -576,7 +576,7 @@ static void pose_slide_apply_quat(tPoseSlideOp *pso, tPChanFCurveLink *pfl) float quat_diff[4]; /* calculate the delta transform from the previous to the current */ - /* TODO: investigate ways to favour one transform more? */ + /* TODO: investigate ways to favor one transform more? */ sub_qt_qtqt(quat_diff, quat_curr, quat_prev); /* increase the original by the delta transform, by an amount determined by percentage */ diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 8af3664d41b..517d8ca51a3 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -722,7 +722,7 @@ static void ui_view2d_curRect_validate_resize(View2D *v2d, bool resize, bool mas * - width is OK, but need to check if outside of boundaries * * So, resolution is to just shift view by the gap between the extremities. - * We favour moving the 'minimum' across, as that's origin for most things + * We favor moving the 'minimum' across, as that's origin for most things. * (XXX - in the past, max was favored... if there are bugs, swap!) */ if ((cur->xmin < tot->xmin) && (cur->xmax > tot->xmax)) { @@ -779,7 +779,7 @@ static void ui_view2d_curRect_validate_resize(View2D *v2d, bool resize, bool mas * - height is OK, but need to check if outside of boundaries * * So, resolution is to just shift view by the gap between the extremities. - * We favour moving the 'minimum' across, as that's origin for most things + * We favor moving the 'minimum' across, as that's origin for most things. */ if ((cur->ymin < tot->ymin) && (cur->ymax > tot->ymax)) { /* outside boundaries on both sides, diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c index 3562569acec..ee697955ad4 100644 --- a/source/blender/makesrna/intern/rna_scene_api.c +++ b/source/blender/makesrna/intern/rna_scene_api.c @@ -365,7 +365,7 @@ void RNA_api_scene(StructRNA *srna) RNA_def_function_ui_description(func, "Clear sequence editor in this scene"); # ifdef WITH_ALEMBIC - /* XXX Deprecated, will be removed in 2.8 in favour of calling the export operator. */ + /* XXX Deprecated, will be removed in 2.8 in favor of calling the export operator. */ func = RNA_def_function(srna, "alembic_export", "rna_Scene_alembic_export"); RNA_def_function_ui_description( func, "Export to Alembic file (deprecated, use the Alembic export operator)"); diff --git a/source/blender/usd/intern/usd_writer_mesh.cc b/source/blender/usd/intern/usd_writer_mesh.cc index dc603f25b21..6bdfed000a4 100644 --- a/source/blender/usd/intern/usd_writer_mesh.cc +++ b/source/blender/usd/intern/usd_writer_mesh.cc @@ -59,7 +59,7 @@ bool USDGenericMeshWriter::is_supported(const HierarchyContext *context) const if (is_dupli) { /* Construct the object's base flags from its dupliparent, just like is done in - * deg_objects_dupli_iterator_next(). Without this, the visiblity check below will fail. Doing + * 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. */ base_flag = object->base_flag; -- cgit v1.2.3