From a148c4676b925d223b099edb17a58c7fd9a0a215 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 10 Jul 2020 16:04:09 +1000 Subject: Cleanup: spelling --- source/blender/blenkernel/intern/CCGSubSurf_util.c | 2 +- .../blenkernel/intern/multires_reshape_smooth.c | 2 +- source/blender/blenkernel/intern/particle.c | 10 +++++----- source/blender/blenkernel/intern/softbody.c | 18 +++++++++++------- source/blender/blenlib/BLI_utildefines.h | 10 +++++----- source/blender/blenlib/intern/path_util.c | 2 +- .../depsgraph/intern/builder/deg_builder_relations.cc | 2 +- source/blender/editors/include/ED_anim_api.h | 2 +- source/blender/editors/interface/interface_widgets.c | 2 +- source/blender/editors/sculpt_paint/sculpt.c | 2 +- source/blender/io/avi/intern/avi_mjpeg.c | 2 +- source/blender/python/intern/bpy_rna_anim.c | 2 +- source/blender/python/intern/bpy_rna_id_collection.c | 2 +- 13 files changed, 31 insertions(+), 27 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/CCGSubSurf_util.c b/source/blender/blenkernel/intern/CCGSubSurf_util.c index 58d5f2e0495..bc63d8b97f7 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_util.c +++ b/source/blender/blenkernel/intern/CCGSubSurf_util.c @@ -304,7 +304,7 @@ void ccgSubSurf__dumpCoords(CCGSubSurf *ss) } for (x = 0; x < gridSize; x++) { float *co = FACE_getIECo(f, subdivLevels, S, x); - printf("face index=%d. cornder=%d, ie_index=%d, coord=(%f, %f, %f)\n", + printf("face index=%d. corner=%d, ie_index=%d, coord=(%f, %f, %f)\n", index, S, x, diff --git a/source/blender/blenkernel/intern/multires_reshape_smooth.c b/source/blender/blenkernel/intern/multires_reshape_smooth.c index 3564ae80d24..e12e692ea23 100644 --- a/source/blender/blenkernel/intern/multires_reshape_smooth.c +++ b/source/blender/blenkernel/intern/multires_reshape_smooth.c @@ -271,7 +271,7 @@ static void base_surface_grids_allocate(MultiresReshapeSmoothContext *reshape_sm for (int grid_index = 0; grid_index < num_grids; ++grid_index) { surface_grid[grid_index].points = MEM_calloc_arrayN( - sizeof(SurfacePoint), grid_area, "delta grid dispalcement"); + sizeof(SurfacePoint), grid_area, "delta grid displacement"); } reshape_smooth_context->base_surface_grids = surface_grid; diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index cb1b523a7a9..a003daf1042 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -283,8 +283,8 @@ int count_particles_mod(ParticleSystem *psys, int totgr, int cur) } return tot; } -/* we allocate path cache memory in chunks instead of a big contiguous - * chunk, windows' memory allocater fails to find big blocks of memory often */ +/* We allocate path cache memory in chunks instead of a big contiguous + * chunk, windows' memory allocator fails to find big blocks of memory often. */ #define PATH_CACHE_BUF_SIZE 1024 @@ -1297,7 +1297,7 @@ static void do_particle_interpolation(ParticleSystem *psys, dfra = keys[2].time - keys[1].time; keytime = (real_t - keys[1].time) / dfra; - /* convert velocity to timestep size */ + /* Convert velocity to time-step size. */ if (pind->keyed || pind->cache || point_vel) { invdt = dfra * 0.04f * (psys ? psys->part->timetweak : 1.f); mul_v3_fl(keys[1].vel, invdt); @@ -1305,8 +1305,8 @@ static void do_particle_interpolation(ParticleSystem *psys, interp_qt_qtqt(result->rot, keys[1].rot, keys[2].rot, keytime); } - /* Now we should have in chronologiacl order k1<=k2<=t<=k3<=k4 with keytime between - * [0, 1]->[k2, k3] (k1 & k4 used for cardinal & bspline interpolation). */ + /* Now we should have in chronological order k1<=k2<=t<=k3<=k4 with key-time between + * [0, 1]->[k2, k3] (k1 & k4 used for cardinal & b-spline interpolation). */ psys_interpolate_particle((pind->keyed || pind->cache || point_vel) ? -1 /* signal for cubic interpolation */ : diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 75da92a26b8..b7b325644ca 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -165,24 +165,28 @@ static void free_softbody_intern(SoftBody *sb); /*physical unit of force is [kg * m / sec^2]*/ -static float sb_grav_force_scale(Object *UNUSED(ob)) -/* since unit of g is [m/sec^2] and F = mass * g we rescale unit mass of node to 1 gramm - * put it to a function here, so we can add user options later without touching simulation code +/** + * Since unit of g is [m/sec^2] and F = mass * g we re-scale unit mass of node to 1 gram + * put it to a function here, so we can add user options later without touching simulation code. */ +static float sb_grav_force_scale(Object *UNUSED(ob)) { return (0.001f); } -static float sb_fric_force_scale(Object *UNUSED(ob)) -/* rescaling unit of drag [1 / sec] to somehow reasonable - * put it to a function here, so we can add user options later without touching simulation code +/** + * Re-scaling unit of drag [1 / sec] to somehow reasonable + * put it to a function here, so we can add user options later without touching simulation code. */ +static float sb_fric_force_scale(Object *UNUSED(ob)) { return (0.01f); } +/** + * Defining the frames to *real* time relation. + */ static float sb_time_scale(Object *ob) -/* defining the frames to *real* time relation */ { SoftBody *sb = ob->soft; /* is supposed to be there */ if (sb) { diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index 1f28f7e80c5..bc35e969e6a 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -627,11 +627,11 @@ extern bool BLI_memory_is_zero(const void *arr, const size_t arr_size); /** \name String Macros * \{ */ -/* Macro to convert a value to string in the preprocessor - * STRINGIFY_ARG: gives the argument as a string - * STRINGIFY_APPEND: appends any argument 'b' onto the string argument 'a', - * used by STRINGIFY because some preprocessors warn about zero arguments - * STRINGIFY: gives the argument's value as a string */ +/* Macro to convert a value to string in the pre-processor: + * - `STRINGIFY_ARG`: gives the argument as a string + * - `STRINGIFY_APPEND`: appends any argument 'b' onto the string argument 'a', + * used by `STRINGIFY` because some preprocessors warn about zero arguments + * - `STRINGIFY`: gives the argument's value as a string. */ #define STRINGIFY_ARG(x) "" #x #define STRINGIFY_APPEND(a, b) "" a #b #define STRINGIFY(x) STRINGIFY_APPEND("", x) diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 2f51b66725b..d912cb8d464 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -242,7 +242,7 @@ void BLI_path_normalize(const char *relabase, char *path) /* Note: previous version of following call used an offset of 3 instead of 4, * which meant that the "/../home/me" example actually became "home/me". - * Using offset of 3 gives behavior consistent with the abovementioned + * Using offset of 3 gives behavior consistent with the aforementioned * Python routine. */ memmove(path, path + 3, strlen(path + 3) + 1); } diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 50c52a519b4..8054946777c 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -2949,7 +2949,7 @@ void DepsgraphRelationBuilder::build_driver_relations(IDNode *id_node) } add_operation_relation( - op_from->get_exit_operation(), op_to->get_entry_operation(), "Driver Serialisation"); + op_from->get_exit_operation(), op_to->get_entry_operation(), "Driver Serialization"); break; } } diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h index 3aecec0d6b6..bffa11a32f2 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.h @@ -708,7 +708,7 @@ void getcolor_fcurve_rainbow(int cur, int tot, float out[3]); /* ----------------- NLA Drawing ----------------------- */ /* NOTE: Technically, this is not in the animation module (it's in space_nla) - * but these are sometimes needed by various animation apis. + * but these are sometimes needed by various animation API's. */ /* Get color to use for NLA Action channel's background */ diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 31f8c89c2bc..c8f2bec145b 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -4584,7 +4584,7 @@ void ui_draw_but(const bContext *C, struct ARegion *region, uiStyle *style, uiBu if ((but->drawflag & (UI_BUT_TEXT_LEFT | UI_BUT_TEXT_RIGHT)) == 0) { but->drawflag |= UI_BUT_TEXT_LEFT; } - /* widget_optionbut() carefully sets the text rectangle for fine tuned paddings. If the + /* #widget_optionbut() carefully sets the text rectangle for fine tuned paddings. If the * text drawing were to add its own padding, DPI and zoom factor would be applied twice * in the final padding, so it's difficult to control it. */ but->drawflag |= UI_BUT_NO_TEXT_PADDING; diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index edbd123c7a7..ffdf2c1e7c0 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -8823,7 +8823,7 @@ static void SCULPT_OT_mask_by_color(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER; ot->prop = RNA_def_boolean( - ot->srna, "contiguous", false, "Contiguous", "Mask only contiguos color areas"); + ot->srna, "contiguous", false, "Contiguous", "Mask only contiguous color areas"); ot->prop = RNA_def_boolean(ot->srna, "invert", false, "Invert", "Invert the generated mask"); ot->prop = RNA_def_boolean( diff --git a/source/blender/io/avi/intern/avi_mjpeg.c b/source/blender/io/avi/intern/avi_mjpeg.c index 70ddca28060..7584649dee2 100644 --- a/source/blender/io/avi/intern/avi_mjpeg.c +++ b/source/blender/io/avi/intern/avi_mjpeg.c @@ -20,7 +20,7 @@ /** \file * \ingroup avi * - * This is external code. Converts between avi and mpeg/jpeg. + * This is external code. Converts between AVI and MPEG/JPEG. */ #include diff --git a/source/blender/python/intern/bpy_rna_anim.c b/source/blender/python/intern/bpy_rna_anim.c index d792b2032b5..1c84e95672f 100644 --- a/source/blender/python/intern/bpy_rna_anim.c +++ b/source/blender/python/intern/bpy_rna_anim.c @@ -415,7 +415,7 @@ char pyrna_struct_keyframe_delete_doc[] = " :arg group: The name of the group the F-Curve should be added to if it doesn't exist " "yet.\n" " :type group: str\n" - " :return: Success of keyframe deleation.\n" + " :return: Success of keyframe deletion.\n" " :rtype: boolean\n"; PyObject *pyrna_struct_keyframe_delete(BPy_StructRNA *self, PyObject *args, PyObject *kw) { diff --git a/source/blender/python/intern/bpy_rna_id_collection.c b/source/blender/python/intern/bpy_rna_id_collection.c index b607f1635e6..a4df8c3aef1 100644 --- a/source/blender/python/intern/bpy_rna_id_collection.c +++ b/source/blender/python/intern/bpy_rna_id_collection.c @@ -132,7 +132,7 @@ static int foreach_libblock_id_user_map_callback(LibraryIDLinkCallbackData *cb_d PyDoc_STRVAR(bpy_user_map_doc, ".. method:: user_map([subset=(id1, id2, ...)], key_types={..}, value_types={..})\n" "\n" - " Returns a mapping of all ID datablocks in current ``bpy.data`` to a set of all " + " Returns a mapping of all ID data-blocks in current ``bpy.data`` to a set of all " "datablocks using them.\n" "\n" " For list of valid set members for key_types & value_types, see: " -- cgit v1.2.3