[Bf-blender-cvs] [df8f507f411] master: Cleanup: spelling in comments
Campbell Barton
noreply at git.blender.org
Wed Oct 6 05:54:51 CEST 2021
Commit: df8f507f411fd71e649e9a896f53c2e574558525
Author: Campbell Barton
Date: Wed Oct 6 14:44:27 2021 +1100
Branches: master
https://developer.blender.org/rBdf8f507f411fd71e649e9a896f53c2e574558525
Cleanup: spelling in comments
===================================================================
M intern/cycles/kernel/geom/geom_shader_data.h
M intern/cycles/kernel/kernel_shader.h
M intern/cycles/kernel/kernel_types.h
M intern/ghost/intern/GHOST_SystemPathsUnix.cpp
M intern/ghost/intern/GHOST_SystemX11.cpp
M source/blender/blenfont/intern/blf_internal_types.h
M source/blender/blenkernel/intern/editmesh_bvh.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/mask_rasterize.c
M source/blender/blenkernel/intern/vfont.c
M source/blender/blenkernel/intern/vfontdata_freetype.c
M source/blender/blenlib/BLI_array.hh
M source/blender/editors/interface/interface.c
M source/blender/editors/object/object_bake_api.c
M source/blender/editors/render/render_preview.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/imbuf/intern/jp2.c
M source/blender/imbuf/intern/oiio/openimageio_api.cpp
M source/blender/imbuf/intern/png.c
M source/blender/imbuf/intern/tiff.c
M source/blender/io/avi/intern/avi_rgb.c
M source/blender/makesdna/DNA_gpencil_modifier_types.h
M source/blender/nodes/shader/nodes/node_shader_valToRgb.cc
M source/blender/python/intern/bpy_rna.c
M source/blender/render/intern/texture_procedural.c
M source/blender/simulation/intern/ConstrainedConjugateGradient.h
===================================================================
diff --git a/intern/cycles/kernel/geom/geom_shader_data.h b/intern/cycles/kernel/geom/geom_shader_data.h
index 0e373c10086..5dc03940238 100644
--- a/intern/cycles/kernel/geom/geom_shader_data.h
+++ b/intern/cycles/kernel/geom/geom_shader_data.h
@@ -37,7 +37,7 @@ ccl_device void shader_setup_object_transforms(const KernelGlobals *ccl_restrict
#endif
/* TODO: break this up if it helps reduce register pressure to load data from
- * global memory as we write it to shaderdata. */
+ * global memory as we write it to shader-data. */
ccl_device_inline void shader_setup_from_ray(const KernelGlobals *ccl_restrict kg,
ShaderData *ccl_restrict sd,
const Ray *ccl_restrict ray,
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h
index e7133724c85..a50f3fb214b 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -780,8 +780,8 @@ ccl_device_inline void shader_eval_volume(INTEGRATOR_STATE_CONST_ARGS,
break;
}
- /* setup shaderdata from stack. it's mostly setup already in
- * shader_setup_from_volume, this switching should be quick */
+ /* Setup shader-data from stack. it's mostly setup already in
+ * shader_setup_from_volume, this switching should be quick. */
sd->object = entry.object;
sd->lamp = LAMP_NONE;
sd->shader = entry.shader;
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 1a986c58878..6107e1028ba 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -190,7 +190,7 @@ enum SamplingPattern {
SAMPLING_NUM_PATTERNS,
};
-/* these flags values correspond to raytypes in osl.cpp, so keep them in sync! */
+/* These flags values correspond to `raytypes` in `osl.cpp`, so keep them in sync! */
enum PathRayFlag {
/* --------------------------------------------------------------------
diff --git a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp b/intern/ghost/intern/GHOST_SystemPathsUnix.cpp
index b58799e9c2a..8bc2ff9227d 100644
--- a/intern/ghost/intern/GHOST_SystemPathsUnix.cpp
+++ b/intern/ghost/intern/GHOST_SystemPathsUnix.cpp
@@ -142,7 +142,7 @@ const char *GHOST_SystemPathsUnix::getUserSpecialDir(GHOST_TUserSpecialDirTypes
}
static string path = "";
- /* Pipe stderr to /dev/null to avoid error prints. We will fail gracefully still. */
+ /* Pipe `stderr` to `/dev/null` to avoid error prints. We will fail gracefully still. */
string command = string("xdg-user-dir ") + type_str + " 2> /dev/null";
FILE *fstream = popen(command.c_str(), "r");
@@ -152,7 +152,7 @@ const char *GHOST_SystemPathsUnix::getUserSpecialDir(GHOST_TUserSpecialDirTypes
std::stringstream path_stream;
while (!feof(fstream)) {
char c = fgetc(fstream);
- /* xdg-user-dir ends the path with '\n'. */
+ /* `xdg-user-dir` ends the path with '\n'. */
if (c == '\n') {
break;
}
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 86b4245ca67..ab8039ea95d 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -1044,7 +1044,7 @@ void GHOST_SystemX11::processEvent(XEvent *xe)
#ifdef USE_NON_LATIN_KB_WORKAROUND
/* XXX: Code below is kinda awfully convoluted... Issues are:
- * - In keyboards like latin ones, numbers need a 'Shift' to be accessed but key_sym
+ * - In keyboards like Latin ones, numbers need a 'Shift' to be accessed but key_sym
* is unmodified (or anyone swapping the keys with `xmodmap`).
* - #XLookupKeysym seems to always use first defined key-map (see T47228), which generates
* key-codes unusable by ghost_key_from_keysym for non-Latin-compatible key-maps.
@@ -1131,7 +1131,7 @@ void GHOST_SystemX11::processEvent(XEvent *xe)
}
}
#else
- /* In keyboards like latin ones,
+ /* In keyboards like Latin ones,
* numbers needs a 'Shift' to be accessed but key_sym
* is unmodified (or anyone swapping the keys with xmodmap).
*
diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h
index 38d7d7b6e21..e90f82da7f3 100644
--- a/source/blender/blenfont/intern/blf_internal_types.h
+++ b/source/blender/blenfont/intern/blf_internal_types.h
@@ -152,7 +152,7 @@ typedef struct FontBufInfoBLF {
struct ColorManagedDisplay *display;
/* and the color, the alphas is get from the glyph!
- * color is srgb space */
+ * color is sRGB space */
float col_init[4];
/* cached conversion from 'col_init' */
unsigned char col_char[4];
diff --git a/source/blender/blenkernel/intern/editmesh_bvh.c b/source/blender/blenkernel/intern/editmesh_bvh.c
index 087481b1b5d..5058863912f 100644
--- a/source/blender/blenkernel/intern/editmesh_bvh.c
+++ b/source/blender/blenkernel/intern/editmesh_bvh.c
@@ -221,7 +221,7 @@ static void bmbvh_tri_from_face(const float *cos[3],
}
}
-/* taken from bvhutils.c */
+/* Taken from `bvhutils.c`. */
/* -------------------------------------------------------------------- */
/* BKE_bmbvh_ray_cast */
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index b993d743044..2a0f8a597d1 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -1560,9 +1560,9 @@ bool BKE_imtype_requires_linear_float(const char imtype)
char BKE_imtype_valid_channels(const char imtype, bool write_file)
{
- char chan_flag = IMA_CHAN_FLAG_RGB; /* assume all support rgb */
+ char chan_flag = IMA_CHAN_FLAG_RGB; /* Assume all support RGB. */
- /* alpha */
+ /* Alpha. */
switch (imtype) {
case R_IMF_IMTYPE_BMP:
if (write_file) {
@@ -1583,7 +1583,7 @@ char BKE_imtype_valid_channels(const char imtype, bool write_file)
break;
}
- /* bw */
+ /* BW. */
switch (imtype) {
case R_IMF_IMTYPE_BMP:
case R_IMF_IMTYPE_PNG:
@@ -3078,8 +3078,7 @@ int BKE_imbuf_write_as(ImBuf *ibuf, const char *name, ImageFormatData *imf, cons
ImBuf ibuf_back = *ibuf;
int ok;
- /* all data is rgba anyway,
- * this just controls how to save for some formats */
+ /* All data is RGBA anyway, this just controls how to save for some formats. */
ibuf->planes = imf->planes;
ok = BKE_imbuf_write(ibuf, name, imf);
@@ -4611,7 +4610,7 @@ static ImBuf *load_image_single(Image *ima,
image_init_after_load(ima, iuser, ibuf);
*r_assign = true;
- /* make packed file for autopack */
+ /* Make packed file for auto-pack. */
if ((has_packed == false) && (G.fileflags & G_FILE_AUTOPACK)) {
ImagePackedFile *imapf = MEM_mallocN(sizeof(ImagePackedFile), "Image Pack-file");
BLI_addtail(&ima->packedfiles, imapf);
diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c
index e04e5fceec6..0c40a1b5078 100644
--- a/source/blender/blenkernel/intern/mask_rasterize.c
+++ b/source/blender/blenkernel/intern/mask_rasterize.c
@@ -151,7 +151,7 @@ BLI_INLINE unsigned int clampis_uint(const unsigned int v,
}
/* --------------------------------------------------------------------- */
-/* local structs for mask rasterizeing */
+/* local structs for mask rasterizing */
/* --------------------------------------------------------------------- */
/**
diff --git a/source/blender/blenkernel/intern/vfont.c b/source/blender/blenkernel/intern/vfont.c
index 01c232e5a70..43c8a59baad 100644
--- a/source/blender/blenkernel/intern/vfont.c
+++ b/source/blender/blenkernel/intern/vfont.c
@@ -342,12 +342,12 @@ VFont *BKE_vfont_load(Main *bmain, const char *filepath)
vfont->data = vfd;
BLI_strncpy(vfont->filepath, filepath, sizeof(vfont->filepath));
- /* if autopack is on store the packedfile in de font structure */
+ /* if auto-pack is on store the packed-file in de font structure */
if (!is_builtin && (G.fileflags & G_FILE_AUTOPACK)) {
vfont->packedfile = pf;
}
- /* Do not add FO_BUILTIN_NAME to temporary listbase */
+ /* Do not add #FO_BUILTIN_NAME to temporary list-base. */
if (!STREQ(filename, FO_BUILTIN_NAME)) {
vfont->temp_pf = BKE_packedfile_new(NULL, filepath, BKE_main_blendfile_path(bmain));
}
@@ -694,7 +694,7 @@ struct TempLineInfo {
float x_min; /* left margin */
float x_max; /* right margin */
int char_nr; /* number of characters */
- int wspace_nr; /* number of whitespaces of line */
+ int wspace_nr; /* number of white-spaces of line */
};
/* -------------------------------------------------------------------- */
@@ -803,7 +803,7 @@ static bool vfont_to_curve(Object *ob,
float longest_line_length = 0.0f;
/* Text at the beginning of the last used text-box (use for y-axis alignment).
- * We overallocate by one to simplify logic of getting last char. */
+ * We over-allocate by one to simplify logic of getting last char. */
int *i_textbox_array = MEM_callocN(sizeof(*i_textbox_array) * (cu->totbox + 1),
"TextBox initial char index");
@@ -1136,7 +1136,7 @@ static bool vfont_to_curve(Object *ob,
}
}
- /* linedata is now: width of line */
+ /* Line-data is now: width of line. */
if (cu->spacemode != CU_ALIGN_X_LEFT) {
ct = chartransdata;
@@ -1500,7 +1500,7 @@ static bool vfont_to_curve(Object *ob,
chartransdata = NULL;
}
else if (mode == FO_EDIT) {
- /* make nurbdata */
+ /* Make NURBS-data. */
BKE_nurbList_free(r_nubase);
ct = chartransdata;
diff --git a/source/blender/blenkernel/intern/vfontdata_freetype.c b/source/blender/blenkernel/intern/vfontdata_freetype.c
index caeb016aaa3..bd58d156d06 100644
--- a/source/blender/blenkernel/intern/vfontdata_freetype.c
+++ b/source/blender/blenkernel/intern/vfontdata_freetype.c
@@ -100,7 +100,7 @@ static VChar *freetypechar_to_vchar(FT_Face face, FT_ULong charcode, VFontData *
/* Start conver
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list