[Bf-blender-cvs] [adb49ffa240] master: Cleanup: spelling in comments
Campbell Barton
noreply at git.blender.org
Tue Dec 13 02:36:25 CET 2022
Commit: adb49ffa240e2ef99a6a2ddb86666b2f06514b27
Author: Campbell Barton
Date: Tue Dec 13 12:34:32 2022 +1100
Branches: master
https://developer.blender.org/rBadb49ffa240e2ef99a6a2ddb86666b2f06514b27
Cleanup: spelling in comments
===================================================================
M source/blender/blenkernel/intern/boids.c
M source/blender/blenkernel/intern/key.cc
M source/blender/blenkernel/intern/volume.cc
M source/blender/draw/engines/eevee/eevee_shaders.cc
M source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_common_info.hh
M source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_volume_info.hh
M source/blender/editors/interface/interface_handlers.cc
M source/blender/editors/interface/interface_icons.cc
M source/blender/gpu/GPU_texture.h
M source/blender/gpu/intern/gpu_shader_create_info.cc
M source/blender/gpu/intern/gpu_shader_create_info.hh
M source/blender/gpu/intern/gpu_texture_private.hh
M source/blender/gpu/metal/mtl_batch.mm
M source/blender/gpu/metal/mtl_texture.mm
M source/blender/nodes/composite/nodes/node_composite_glare.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c
index a0458f0f8d8..63e393aa4f0 100644
--- a/source/blender/blenkernel/intern/boids.c
+++ b/source/blender/blenkernel/intern/boids.c
@@ -1127,7 +1127,7 @@ void boid_brain(BoidBrainData *bbd, int p, ParticleData *pa)
/* decide on jumping & liftoff */
if (bpa->data.mode == eBoidMode_OnLand) {
- /* fuzziness makes boids capable of misjudgement */
+ /* Fuzziness makes boids capable of misjudgment. */
float mul = 1.0f + state->rule_fuzziness;
if (boids->options & BOID_ALLOW_FLIGHT && bbd->wanted_co[2] > 0.0f) {
diff --git a/source/blender/blenkernel/intern/key.cc b/source/blender/blenkernel/intern/key.cc
index d3eb56d1563..7db815e7f9d 100644
--- a/source/blender/blenkernel/intern/key.cc
+++ b/source/blender/blenkernel/intern/key.cc
@@ -1877,7 +1877,7 @@ KeyBlock *BKE_keyblock_add_ctime(Key *key, const char *name, const bool do_force
const float cpos = key->ctime / 100.0f;
/* In case of absolute keys, there is no point in adding more than one key with the same pos.
- * Hence only set new keybloc pos to current time if none previous one already use it.
+ * Hence only set new key-block pos to current time if none previous one already use it.
* Now at least people just adding absolute keys without touching to ctime
* won't have to systematically use retiming func (and have ordering issues, too). See T39897.
*/
diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc
index ae921764de4..b768ad07aa0 100644
--- a/source/blender/blenkernel/intern/volume.cc
+++ b/source/blender/blenkernel/intern/volume.cc
@@ -320,11 +320,11 @@ struct VolumeGrid {
openvdb::io::File file(filepath);
- /* Isolate file loading since that's potentially multithreaded and we are
+ /* Isolate file loading since that's potentially multi-threaded and we are
* holding a mutex lock. */
blender::threading::isolate_task([&] {
try {
- /* Disably delay loading and file copying, this has poor performance
+ /* Disable delay loading and file copying, this has poor performance
* on network drivers. */
const bool delay_load = false;
file.setCopyMaxBytes(0);
@@ -886,7 +886,7 @@ bool BKE_volume_load(const Volume *volume, const Main *bmain)
openvdb::GridPtrVec vdb_grids;
try {
- /* Disably delay loading and file copying, this has poor performance
+ /* Disable delay loading and file copying, this has poor performance
* on network drivers. */
const bool delay_load = false;
file.setCopyMaxBytes(0);
diff --git a/source/blender/draw/engines/eevee/eevee_shaders.cc b/source/blender/draw/engines/eevee/eevee_shaders.cc
index fbdefcd8bee..d7901a9fac4 100644
--- a/source/blender/draw/engines/eevee/eevee_shaders.cc
+++ b/source/blender/draw/engines/eevee/eevee_shaders.cc
@@ -1158,7 +1158,7 @@ World *EEVEE_world_default_get(void)
* Source is provided separately, rather than via create-info as source is manipulated
* by `eevee_shader_material_create_info_amend`.
*
- * We also retain the previous behaviour for ensuring library includes occur in the
+ * We also retain the previous behavior for ensuring library includes occur in the
* correct order. */
static const char *eevee_get_vert_info(int options, char **r_src)
{
@@ -1288,7 +1288,7 @@ static char *eevee_get_defines(int options)
* CreateInfo's for EEVEE materials are declared in:
* `eevee/shaders/infos/eevee_legacy_material_info.hh`
*
- * This function should only contain defines which alter behaviour, but do not affect shader
+ * This function should only contain defines which alter behavior, but do not affect shader
* resources. */
if ((options & VAR_WORLD_BACKGROUND) != 0) {
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_common_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_common_info.hh
index 2b6f31774b3..45ecd339f5f 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_common_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_common_info.hh
@@ -21,7 +21,7 @@ GPU_SHADER_CREATE_INFO(eevee_legacy_irradiance_lib)
GPU_SHADER_CREATE_INFO(eevee_legacy_common_utiltex_lib)
.sampler(2, ImageType::FLOAT_2D_ARRAY, "utilTex");
-/* Raytrace lib. */
+/* Ray-trace lib. */
GPU_SHADER_CREATE_INFO(eevee_legacy_raytrace_lib)
.additional_info("draw_view")
.additional_info("eevee_legacy_common_lib")
@@ -33,7 +33,7 @@ GPU_SHADER_CREATE_INFO(eevee_legacy_ambient_occlusion_lib)
.additional_info("eevee_legacy_raytrace_lib")
.sampler(5, ImageType::FLOAT_2D, "horizonBuffer");
-/* Lightprobe lib. */
+/* Light-probe lib. */
GPU_SHADER_CREATE_INFO(eevee_legacy_lightprobe_lib)
.additional_info("eevee_legacy_common_lib")
.additional_info("eevee_legacy_common_utiltex_lib")
@@ -128,7 +128,7 @@ GPU_SHADER_CREATE_INFO(eevee_legacy_surface_lib_hair)
GPU_SHADER_CREATE_INFO(eevee_legacy_surface_lib_pointcloud)
.define("USE_SURFACE_LIB_POINTCLOUD")
- /* Pointcloud still uses the common interface as well. */
+ /* Point-cloud still uses the common interface as well. */
.additional_info("eevee_legacy_surface_lib_common")
.vertex_out(eevee_legacy_surface_point_cloud_iface);
diff --git a/source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_volume_info.hh b/source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_volume_info.hh
index a95d734de56..e283536e182 100644
--- a/source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_volume_info.hh
+++ b/source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_volume_info.hh
@@ -2,7 +2,7 @@
#pragma once
-/* Voluemtric iface. */
+/* Volumetric iface. */
GPU_SHADER_INTERFACE_INFO(legacy_volume_vert_geom_iface, "volumetric_vert_iface")
.smooth(Type::VEC4, "vPos");
diff --git a/source/blender/editors/interface/interface_handlers.cc b/source/blender/editors/interface/interface_handlers.cc
index f303dfa146c..2d90b6f0d22 100644
--- a/source/blender/editors/interface/interface_handlers.cc
+++ b/source/blender/editors/interface/interface_handlers.cc
@@ -995,7 +995,7 @@ static void ui_apply_but_funcs_after(bContext *C)
BLI_listbase_clear(&UIAfterFuncs);
LISTBASE_FOREACH_MUTABLE (uiAfterFunc *, afterf, &funcs) {
- uiAfterFunc after = *afterf; /* copy to avoid memleak on exit() */
+ uiAfterFunc after = *afterf; /* Copy to avoid memory leak on exit(). */
BLI_freelinkN(&funcs, afterf);
if (after.context) {
diff --git a/source/blender/editors/interface/interface_icons.cc b/source/blender/editors/interface/interface_icons.cc
index 08804be4d04..8f6b46aa717 100644
--- a/source/blender/editors/interface/interface_icons.cc
+++ b/source/blender/editors/interface/interface_icons.cc
@@ -2312,7 +2312,7 @@ int UI_icon_from_rnaptr(const bContext *C, PointerRNA *ptr, int rnaicon, const b
return rnaicon;
}
- /* try ID, material, texture or dynapaint slot */
+ /* Try ID, material, texture or dynamic-paint slot. */
if (RNA_struct_is_ID(ptr->type)) {
id = ptr->owner_id;
}
diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.h
index fd3c938b56f..6cbdda4cd4c 100644
--- a/source/blender/gpu/GPU_texture.h
+++ b/source/blender/gpu/GPU_texture.h
@@ -187,7 +187,7 @@ typedef enum eGPUDataFormat {
} eGPUDataFormat;
/** Texture usage flags.
- * Texture usage flags allow backend implementations to contextually optimise texture resources.
+ * Texture usage flags allow backend implementations to contextually optimize texture resources.
* Any texture with an explicit flag should not perform operations which are not explicitly
* specified in the usage flags. If usage is unknown upfront, then GPU_TEXTURE_USAGE_GENERAL can be
* used.
@@ -202,7 +202,7 @@ typedef enum eGPUTextureUsage {
GPU_TEXTURE_USAGE_SHADER_READ = (1 << 0),
/* Whether the texture is written to by a shader using imageStore. */
GPU_TEXTURE_USAGE_SHADER_WRITE = (1 << 1),
- /* Whether a texture is used as an attachment in a framebuffer. */
+ /* Whether a texture is used as an attachment in a frame-buffer. */
GPU_TEXTURE_USAGE_ATTACHMENT = (1 << 2),
/* Whether the texture is used as a texture view, uses mip-map layer adjustment,
* OR, uses swizzle access masks. Mip-map base layer adjustment and texture channel swizzling
@@ -226,11 +226,11 @@ unsigned int GPU_texture_memory_usage_get(void);
* \note \a data is expected to be float. If the \a format is not compatible with float data or if
* the data is not in float format, use GPU_texture_update to upload the data with the right data
* format.
- * NOTE: _ex variants of texure creation functions allow specification of explicit usage for
+ * NOTE: `_ex` variants of texture creation functions allow specification of explicit usage for
* optimal performance. Using standard texture creation will use the `GPU_TEXTURE_USAGE_GENERAL`.
*
* Textures created via other means will either inherit usage from the source resource, or also
- * be initialised with `GPU_TEXTURE_USAGE_GENERAL`.
+ * be initialized with `GPU_TEXTURE_USAGE_GENERAL`.
*
* flag. \a mips is the number of mip level to allocate. It must be >= 1.
*/
diff --git a/source/blender/gpu/intern/gpu_shader_create_info.cc b/source/blender/gpu/intern/gpu_shader_create_info.cc
index 4544937d6fa..bc3f462e9f9 100644
--- a/source/blender/gpu/intern/gpu_shader_create_info.cc
+++ b/source/blender/gpu/intern/gpu_shader_create_info.cc
@@ -357,13 +357,13 @@ void gpu_shader_create_info_init()
basic_depth_pointcloud_conservative_clipped =
basic_depth_pointcloud_conservative_no_geom_clipped;
- /* Overlay prepass wire. */
+ /* Overlay pre-pass wire. */
overlay_outline_prepass_wire = overlay_outline_prepass_wire_no_geom;
/* Edit UV Edges. */
overlay_edit_uv_edges = overlay_edit_uv_edges_no_geom;
- /* Downsample Cube/Proe rendering. */
+ /* Down-sample Cube/Probe rendering. */
eevee_legacy_effect_downsample_cube = eevee_legacy_effect_downsample_cube_no_geom;
eevee_legacy_pro
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list