[Bf-blender-cvs] [2547c3c70ce] master: Cleanup: spelling in comments
Campbell Barton
noreply at git.blender.org
Fri Apr 22 02:12:57 CEST 2022
Commit: 2547c3c70ceef763ae9698b8dc76c12168a605d4
Author: Campbell Barton
Date: Fri Apr 22 08:16:37 2022 +1000
Branches: master
https://developer.blender.org/rB2547c3c70ceef763ae9698b8dc76c12168a605d4
Cleanup: spelling in comments
===================================================================
M intern/cycles/kernel/integrator/shader_eval.h
M source/blender/blenlib/BLI_color_mix.hh
M source/blender/blenloader/intern/versioning_280.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/include/ED_space_api.h
M source/blender/editors/sculpt_paint/sculpt_ops.c
M source/blender/editors/space_text/text_format_py.c
M source/blender/editors/transform/transform_mode_bend.c
M source/blender/io/usd/tests/usd_tests_common.h
M source/blender/nodes/shader/node_shader_tree.cc
M source/blender/python/intern/bpy_rna.c
M source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
===================================================================
diff --git a/intern/cycles/kernel/integrator/shader_eval.h b/intern/cycles/kernel/integrator/shader_eval.h
index 3ea53b3e647..4da92929366 100644
--- a/intern/cycles/kernel/integrator/shader_eval.h
+++ b/intern/cycles/kernel/integrator/shader_eval.h
@@ -865,7 +865,7 @@ ccl_device_inline void shader_eval_volume(KernelGlobals kg,
* `u(x, T) = u(x - (T - t) * u(x, T), t)`
*
* This is the typical way to model self-advection in fluid dynamics, however, we do not
- * account for other forces affecting the velocity during simulation (pressure, buyoancy,
+ * account for other forces affecting the velocity during simulation (pressure, buoyancy,
* etc.): this gives a linear interpolation when fluid are mostly "curvy". For better
* results, a higher order interpolation scheme can be used (at the cost of more lookups),
* or an interpolation of the velocity fields for the previous and next frames could also
diff --git a/source/blender/blenlib/BLI_color_mix.hh b/source/blender/blenlib/BLI_color_mix.hh
index 6b0c2d914dd..f23d752b8d1 100644
--- a/source/blender/blenlib/BLI_color_mix.hh
+++ b/source/blender/blenlib/BLI_color_mix.hh
@@ -25,9 +25,9 @@ struct ByteTraits {
using BlendType = int;
inline static const uchar range = 255; /* Zero-based maximum value. */
- inline static const float frange = 255.0f; /* Convienent floating-point version of range. */
+ inline static const float frange = 255.0f; /* Convenient floating-point version of range. */
inline static const int cmpRange = 254;
- inline static const int expandedRange = 256; /* One-based maxium value. */
+ inline static const int expandedRange = 256; /* One-based maximum value. */
inline static const int bytes = 1;
inline static const float unit = 255.0f;
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index b884fa96d12..d992d426b9a 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -1926,7 +1926,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
- /* Grease pencil multiframe falloff curve */
+ /* Grease pencil multi-frame falloff curve. */
if (!DNA_struct_elem_find(
fd->filesdna, "GP_Sculpt_Settings", "CurveMapping", "cur_falloff")) {
for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 93a4a784674..7c7f532f087 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1313,7 +1313,7 @@ static void gpencil_stroke_newfrombuffer(tGPsdata *p)
/* Calc geometry data. */
BKE_gpencil_stroke_geometry_update(gpd, gps);
- /* In Multiframe mode, duplicate the stroke in other frames. */
+ /* In multi-frame mode, duplicate the stroke in other frames. */
if (GPENCIL_MULTIEDIT_SESSIONS_ON(p->gpd)) {
const bool tail = (ts->gpencil_flags & GP_TOOL_FLAG_PAINT_ONBACK);
BKE_gpencil_stroke_copy_to_keyframes(gpd, gpl, p->gpf, gps, tail);
diff --git a/source/blender/editors/include/ED_space_api.h b/source/blender/editors/include/ED_space_api.h
index fd4a28240fa..c69698f3f73 100644
--- a/source/blender/editors/include/ED_space_api.h
+++ b/source/blender/editors/include/ED_space_api.h
@@ -18,7 +18,7 @@ struct bContext;
void ED_spacetypes_init(void);
void ED_spacemacros_init(void);
-/* the pluginnable API for export to editors */
+/* The plugin-able API for export to editors. */
/* -------------------------------------------------------------------- */
/** \name Calls for registering default spaces
diff --git a/source/blender/editors/sculpt_paint/sculpt_ops.c b/source/blender/editors/sculpt_paint/sculpt_ops.c
index b5fb7ce3366..e02c1b1aac3 100644
--- a/source/blender/editors/sculpt_paint/sculpt_ops.c
+++ b/source/blender/editors/sculpt_paint/sculpt_ops.c
@@ -1044,7 +1044,7 @@ static int sculpt_mask_by_color_invoke(bContext *C, wmOperator *op, const wmEven
BKE_sculpt_update_object_for_edit(depsgraph, ob, true, true, false);
- /* Color data is not available in Multires or dyanmic topology. */
+ /* Color data is not available in multi-resolution or dynamic topology. */
if (!SCULPT_handles_colors_report(ss, op->reports)) {
return OPERATOR_CANCELLED;
}
diff --git a/source/blender/editors/space_text/text_format_py.c b/source/blender/editors/space_text/text_format_py.c
index 6658ac5a83c..47d0168195b 100644
--- a/source/blender/editors/space_text/text_format_py.c
+++ b/source/blender/editors/space_text/text_format_py.c
@@ -31,12 +31,16 @@
static int txtfmt_py_find_builtinfunc(const char *string)
{
int i, len;
- /* list is from...
+ /**
+ * The following items are derived from this list:
+ * \code{.py}
* ", ".join(['"%s"' % kw
* for kw in sorted(__import__("keyword").kwlist + __import__("keyword").softkwlist)
* if kw not in {"False", "None", "True", "def", "class", "_"}])
+ * \endcode
*
- * ... and for this code:
+ * The code below can be re-generated using:
+ * \code{.py}
* import keyword
* ignore = {"False", "None", "True", "def", "class", "_"}
* keywords = sorted(set(keyword.kwlist + keyword.softkwlist) - ignore)
@@ -48,6 +52,7 @@ static int txtfmt_py_find_builtinfunc(const char *string)
* for (i, kw) in enumerate(keywords)]) + "\n" +
* last % (' '*(longest-2)) + "\n" +
* "}")
+ * \endcode
*/
/* Keep aligned args for readability. */
diff --git a/source/blender/editors/transform/transform_mode_bend.c b/source/blender/editors/transform/transform_mode_bend.c
index 348f012e300..acc6b20810f 100644
--- a/source/blender/editors/transform/transform_mode_bend.c
+++ b/source/blender/editors/transform/transform_mode_bend.c
@@ -106,7 +106,7 @@ static void transdata_elem_bend(const TransInfo *t,
}
if (t->options & CTX_GPENCIL_STROKES) {
- /* grease pencil multiframe falloff */
+ /* Grease pencil multi-frame falloff. */
bGPDstroke *gps = (bGPDstroke *)td->extra;
if (gps != NULL) {
fac_scaled = fac * td->factor * gps->runtime.multi_frame_falloff;
diff --git a/source/blender/io/usd/tests/usd_tests_common.h b/source/blender/io/usd/tests/usd_tests_common.h
index b298a253ddc..7f6ae558354 100644
--- a/source/blender/io/usd/tests/usd_tests_common.h
+++ b/source/blender/io/usd/tests/usd_tests_common.h
@@ -8,7 +8,7 @@ namespace blender::io::usd {
/* Calls the function to load the USD plugins from the
* USD data directory under the Blender bin directory
- * that was supplied as the --test-release-dir flag to ctest.
+ * that was supplied as the --test-release-dir flag to `ctest`.
* Thus function must be called before instantiating a USD
* stage to avoid errors. The returned string is the path to
* the USD data files directory from which the plugins were
diff --git a/source/blender/nodes/shader/node_shader_tree.cc b/source/blender/nodes/shader/node_shader_tree.cc
index f042450700e..c5f40a46ca3 100644
--- a/source/blender/nodes/shader/node_shader_tree.cc
+++ b/source/blender/nodes/shader/node_shader_tree.cc
@@ -957,8 +957,8 @@ static void ntree_shader_shader_to_rgba_branch(bNodeTree *ntree, bNode *output_n
LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
node->tmp_flag = -1;
}
- /* First gather the shader_to_rgba nodes linked to the ouput. This is separate to avoid
- * conflicting usage of the node->tmp_flag. */
+ /* First gather the shader_to_rgba nodes linked to the output. This is separate to avoid
+ * conflicting usage of the `node->tmp_flag`. */
Vector<bNode *> shader_to_rgba_nodes;
nodeChainIterBackwards(ntree, output_node, shader_to_rgba_node_gather, &shader_to_rgba_nodes, 0);
@@ -971,7 +971,7 @@ static void ntree_shader_shader_to_rgba_branch(bNodeTree *ntree, bNode *output_n
bNode *start_node_copy = ntree_shader_copy_branch(
ntree, start_node, closure_node_filter, nullptr, 0);
/* Replace node copy link. This assumes that every node possibly connected to the closure input
- * has only one ouput. */
+ * has only one output. */
bNodeSocket *closure_output = ntree_shader_node_output_get(start_node_copy, 0);
nodeRemLink(ntree, closure_input->link);
nodeAddLink(ntree, start_node_copy, closure_output, shader_to_rgba, closure_input);
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 11b584b692d..c67f0c028cf 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -4398,7 +4398,7 @@ static int pyrna_struct_meta_idprop_setattro(PyObject *cls, PyObject *attr, PyOb
}
}
- /* Fallback to standard py, delattr/setattr. */
+ /* Fallback to standard Python's `delattr/setattr`. */
return PyType_Type.tp_setattro(cls, attr, value);
}
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
index ef6bee0c1fe..992c7a9b2ec 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_intern.h
@@ -124,7 +124,7 @@ struct wmGizmoMap {
/**
* This is a container for all gizmo types that can be instantiated in a region.
- * (similar to dropboxes).
+ * (similar to drop-boxes).
*
* \note There is only ever one of these for every (area, region) combination.
*/
More information about the Bf-blender-cvs
mailing list