[Bf-blender-cvs] [b659d1a5604] master: Cleanup: spelling in comments
Campbell Barton
noreply at git.blender.org
Thu Sep 23 14:11:09 CEST 2021
Commit: b659d1a560410425b3454016eeead8dbae7a0898
Author: Campbell Barton
Date: Thu Sep 23 22:06:49 2021 +1000
Branches: master
https://developer.blender.org/rBb659d1a560410425b3454016eeead8dbae7a0898
Cleanup: spelling in comments
===================================================================
M intern/cycles/integrator/path_trace.h
M intern/cycles/kernel/device/gpu/parallel_active_index.h
M intern/cycles/kernel/kernel_film.h
M intern/cycles/render/integrator.h
M intern/cycles/util/util_math_intersect.h
M source/blender/blenkernel/intern/gpencil_modifier.c
M source/blender/blenkernel/intern/modifier.c
M source/blender/blenlib/tests/BLI_mesh_intersect_test.cc
M source/blender/blenloader/BLO_readfile.h
M source/blender/imbuf/intern/IMB_indexer.h
M source/blender/imbuf/intern/radiance_hdr.c
M source/blender/imbuf/intern/targa.c
M source/blender/python/intern/bpy_interface.c
M source/blender/python/mathutils/mathutils_geometry.c
===================================================================
diff --git a/intern/cycles/integrator/path_trace.h b/intern/cycles/integrator/path_trace.h
index fc7713e6df9..f507c2d7e0a 100644
--- a/intern/cycles/integrator/path_trace.h
+++ b/intern/cycles/integrator/path_trace.h
@@ -286,7 +286,7 @@ class PathTrace {
/* Parameters of the big tile with the current resolution divider applied. */
BufferParams effective_big_tile_params;
- /* Denosier was run and there are denoised versions of the passes in the render buffers. */
+ /* Denoiser was run and there are denoised versions of the passes in the render buffers. */
bool has_denoised_result = false;
/* Current tile has been written (to either disk or callback.
diff --git a/intern/cycles/kernel/device/gpu/parallel_active_index.h b/intern/cycles/kernel/device/gpu/parallel_active_index.h
index 85500bf4d07..a68d1d80c7d 100644
--- a/intern/cycles/kernel/device/gpu/parallel_active_index.h
+++ b/intern/cycles/kernel/device/gpu/parallel_active_index.h
@@ -21,7 +21,7 @@ CCL_NAMESPACE_BEGIN
/* Given an array of states, build an array of indices for which the states
* are active.
*
- * Shared memory requirement is sizeof(int) * (number_of_warps + 1) */
+ * Shared memory requirement is `sizeof(int) * (number_of_warps + 1)`. */
#include "util/util_atomic.h"
diff --git a/intern/cycles/kernel/kernel_film.h b/intern/cycles/kernel/kernel_film.h
index 715d764fb31..e8f4a21878e 100644
--- a/intern/cycles/kernel/kernel_film.h
+++ b/intern/cycles/kernel/kernel_film.h
@@ -394,7 +394,7 @@ film_calculate_shadow_catcher(const KernelFilmConvert *ccl_restrict kfilm_conver
/* NOTE: It is possible that the Shadow Catcher pass is requested as an output without actual
* shadow catcher objects in the scene. In this case there will be no auxiliary passes required
- * for the devision (to save up memory). So delay the asserts to this point so that the number of
+ * for the decision (to save up memory). So delay the asserts to this point so that the number of
* samples check handles such configuration. */
kernel_assert(kfilm_convert->pass_offset != PASS_UNUSED);
kernel_assert(kfilm_convert->pass_combined != PASS_UNUSED);
diff --git a/intern/cycles/render/integrator.h b/intern/cycles/render/integrator.h
index 32e108d62ca..5ad419e02ca 100644
--- a/intern/cycles/render/integrator.h
+++ b/intern/cycles/render/integrator.h
@@ -19,7 +19,7 @@
#include "kernel/kernel_types.h"
-#include "device/device_denoise.h" /* For the paramaters and type enum. */
+#include "device/device_denoise.h" /* For the parameters and type enum. */
#include "graph/node.h"
#include "integrator/adaptive_sampling.h"
diff --git a/intern/cycles/util/util_math_intersect.h b/intern/cycles/util/util_math_intersect.h
index fa3a541eea9..fd0c9124345 100644
--- a/intern/cycles/util/util_math_intersect.h
+++ b/intern/cycles/util/util_math_intersect.h
@@ -40,7 +40,7 @@ ccl_device bool ray_sphere_intersect(float3 ray_P,
/* Ray points away from sphere. */
return false;
}
- const float dsq = tsq - tp * tp; /* pythagoras */
+ const float dsq = tsq - tp * tp; /* Pythagoras. */
if (dsq > radiussq) {
/* Closest point on ray outside sphere. */
return false;
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 6be03bffb3c..de459c2e414 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -329,7 +329,7 @@ void BKE_gpencil_modifier_init(void)
#if 0
/* Note that GPencil actually does not support these atm, but might do in the future. */
- /* Initialize global cmmon storage used for virtual modifier list */
+ /* Initialize global common storage used for virtual modifier list. */
GpencilModifierData *md;
md = BKE_gpencil_modifier_new(eGpencilModifierType_Armature);
virtualModifierCommonData.amd = *((ArmatureGpencilModifierData *)md);
@@ -518,7 +518,7 @@ static void gpencil_modifier_copy_data_id_us_cb(void *UNUSED(userData),
* Copy grease pencil modifier data.
* \param md: Source modifier data
* \param target: Target modifier data
- * \parm flag: Flags
+ * \param flag: Flags
*/
void BKE_gpencil_modifier_copydata_ex(GpencilModifierData *md,
GpencilModifierData *target,
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index b55b02c7bf2..6f6cf12f023 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -100,7 +100,7 @@ void BKE_modifier_init(void)
/* Initialize modifier types */
modifier_type_init(modifier_types); /* MOD_utils.c */
- /* Initialize global cmmon storage used for virtual modifier list */
+ /* Initialize global common storage used for virtual modifier list. */
md = BKE_modifier_new(eModifierType_Armature);
virtualModifierCommonData.amd = *((ArmatureModifierData *)md);
BKE_modifier_free(md);
diff --git a/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc b/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc
index 0329fc156c0..68111fb8eb1 100644
--- a/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc
+++ b/source/blender/blenlib/tests/BLI_mesh_intersect_test.cc
@@ -457,8 +457,8 @@ TEST(mesh_intersect, TwoTris)
{4, 11, 6, 4}, /* 9: T11 edge (-1,1,1)(0,1/2,1/2) inside T4 edge. */
{4, 12, 6, 2}, /* 10: parallel planes, not intersecting. */
{4, 13, 6, 2}, /* 11: non-parallel planes, not intersecting, all one side. */
- {0, 14, 6, 2}, /* 12: non-paralel planes, not intersecting, alternate sides. */
- /* Following are all coplanar cases. */
+ {0, 14, 6, 2}, /* 12: non-parallel planes, not intersecting, alternate sides. */
+ /* Following are all co-planar cases. */
{15, 16, 6, 8}, /* 13: T16 inside T15. NOTE: dup'd tri is expected. */
{15, 17, 8, 8}, /* 14: T17 intersects one edge of T15 at (1,1,0)(3,3,0). */
{15, 18, 10, 12}, /* 15: T18 intersects T15 at (1,1,0)(3,3,0)(3,15/4,1/2)(0,3,2). */
@@ -970,7 +970,7 @@ static void fill_sphere_data(int nrings,
static void spheresphere_test(int nrings, double y_offset, bool use_self)
{
- /* Make two uvspheres with nrings rings ad 2*nrings segments. */
+ /* Make two UV-spheres with nrings rings ad 2*nrings segments. */
if (nrings < 2) {
return;
}
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h
index 3f3e61734ec..c8615545df9 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -211,7 +211,7 @@ typedef enum eBLOLibLinkFlags {
BLO_LIBLINK_NEEDS_ID_TAG_DOIT = 1 << 18,
/** Set fake user on appended IDs. */
BLO_LIBLINK_APPEND_SET_FAKEUSER = 1 << 19,
- /** Append (make local) also indirect dependencies of appendeds IDs. */
+ /** Append (make local) also indirect dependencies of appended IDs. */
BLO_LIBLINK_APPEND_RECURSIVE = 1 << 20,
/** Try to re-use previously appended matching ID on new append. */
BLO_LIBLINK_APPEND_LOCAL_ID_REUSE = 1 << 21,
diff --git a/source/blender/imbuf/intern/IMB_indexer.h b/source/blender/imbuf/intern/IMB_indexer.h
index 37309ccc13a..6c66b11df4f 100644
--- a/source/blender/imbuf/intern/IMB_indexer.h
+++ b/source/blender/imbuf/intern/IMB_indexer.h
@@ -33,7 +33,7 @@
* a) different time-codes within one file (like DTS/PTS, Time-code-Track,
* "implicit" time-codes within DV-files and HDV-files etc.)
* b) seeking difficulties within FFMPEG for files with timestamp holes
- * c) broken files that miss several frames / have varying framerates
+ * c) broken files that miss several frames / have varying frame-rates
* d) use proxies accordingly
*
* ... we need index files, that provide us with
diff --git a/source/blender/imbuf/intern/radiance_hdr.c b/source/blender/imbuf/intern/radiance_hdr.c
index 94b2a62aa26..7f4e4dd31df 100644
--- a/source/blender/imbuf/intern/radiance_hdr.c
+++ b/source/blender/imbuf/intern/radiance_hdr.c
@@ -294,7 +294,7 @@ struct ImBuf *imb_loadhdr(const unsigned char *mem,
break;
}
for (x = 0; x < width; x++) {
- /* convert to ldr */
+ /* Convert to LDR. */
RGBE2FLOAT(sline[x], fcol);
*rect_float++ = fcol[RED];
*rect_float++ = fcol[GRN];
@@ -328,7 +328,7 @@ static int fwritecolrs(
rgbe_scan = (RGBE *)MEM_mallocN(sizeof(RGBE) * width, "radhdr_write_tmpscan");
- /* convert scanline */
+ /* Convert scan-line. */
for (size_t i = 0, j = 0; i < width; i++) {
if (fpscan) {
fcol[RED] = fpscan[j];
diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c
index 8ed0b8b535c..333e29e6d97 100644
--- a/source/blender/imbuf/intern/targa.c
+++ b/source/blender/imbuf/intern/targa.c
@@ -192,7 +192,7 @@ static bool makebody_tga(ImBuf *ibuf, FILE *file, int (*out)(unsigned int, FILE
else {
while (*rect++ == this) { /* seek for first different byte */
if (--bytes == 0) {
- break; /* oor end of line */
+ break; /* Or end of line. */
}
}
rect--;
@@ -470,7 +470,7 @@ static void decodetarga(struct ImBuf *ibuf, const unsigned char *mem, size_t mem
if (psize & 2) {
if (psize & 1) {
- /* order = bgra */
+ /* Order = BGRA. */
cp[0] = mem[3];
cp[1] = mem[0];
cp[2] = mem[1];
@@ -512,7 +512,7 @@ static void decodetarga(struct ImBuf *ibuf, const unsigned char *mem, size_t mem
while (count > 0) {
if (psize & 2) {
if (psize & 1) {
- /* order = bgra */
+ /* Order = BGRA. */
cp[0] = mem[3];
cp[1] = mem[0];
cp[2] = mem[1];
@@ -589,7 +589,7 @@ static void ldtarga(struct ImBuf *ibuf, const unsigned char *mem, size_t mem_siz
if (psize & 2) {
if (psize & 1) {
- /* order = bgra */
+ /* Order = BGRA. */
cp[0] = mem[3];
cp[1] = mem[0];
cp[2] = mem[1];
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_inter
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list