[Bf-blender-cvs] [a78130c6101] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Sat Sep 19 06:36:15 CEST 2020
Commit: a78130c6101517c09eed14215087ab3dfe36bc5c
Author: Campbell Barton
Date: Sat Sep 19 14:18:05 2020 +1000
Branches: master
https://developer.blender.org/rBa78130c6101517c09eed14215087ab3dfe36bc5c
Cleanup: spelling
===================================================================
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/blenloader/intern/versioning_290.c
M source/blender/draw/engines/eevee/eevee_lightprobes.c
M source/blender/draw/engines/workbench/workbench_effect_dof.c
M source/blender/gpu/intern/gpu_vertex_buffer_private.hh
M source/blender/nodes/shader/nodes/node_shader_valToRgb.cc
M source/blender/python/intern/bpy_interface.c
===================================================================
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index a348d759e97..43648713cf8 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -1402,7 +1402,7 @@ static NlaEvalChannel *nlaevalchan_verify(PointerRNA *ptr, NlaEvalData *nlaeval,
/* accumulate the old and new values of a channel according to mode and influence */
static float nla_blend_value(int blendmode, float old_value, float value, float inf)
{
- /* optimisation: no need to try applying if there is no influence */
+ /* Optimization: no need to try applying if there is no influence. */
if (IS_EQF(inf, 0.0f)) {
return old_value;
}
@@ -1443,7 +1443,7 @@ static float nla_blend_value(int blendmode, float old_value, float value, float
static float nla_combine_value(
int mix_mode, float base_value, float old_value, float value, float inf)
{
- /* optimisation: no need to try applying if there is no influence */
+ /* Optimization: no need to try applying if there is no influence. */
if (IS_EQF(inf, 0.0f)) {
return old_value;
}
diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c
index a8452887791..3c95a998d90 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -754,8 +754,8 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
/* Unify symmetry as a mesh property. */
if (!DNA_struct_elem_find(fd->filesdna, "Mesh", "char", "symmetry")) {
LISTBASE_FOREACH (Mesh *, mesh, &bmain->meshes) {
- /* The previous flags used to store mesh symmery in edit mode match the new ones that are
- * used in mesh->symmery. */
+ /* The previous flags used to store mesh symmetry in edit-mode match the new ones that are
+ * used in #Mesh.symmetry. */
mesh->symmetry = mesh->editflag & (ME_SYMMETRY_X | ME_SYMMETRY_Y | ME_SYMMETRY_Z);
}
}
diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c
index 89e61ab939a..0dea767ee3c 100644
--- a/source/blender/draw/engines/eevee/eevee_lightprobes.c
+++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c
@@ -113,7 +113,7 @@ static void planar_pool_ensure_alloc(EEVEE_Data *vedata, int num_planar_ref)
{
EEVEE_TextureList *txl = vedata->txl;
- /* XXX TODO OPTIMISATION : This is a complete waist of texture memory.
+ /* XXX TODO OPTIMIZATION: This is a complete waist of texture memory.
* Instead of allocating each planar probe for each viewport,
* only alloc them once using the biggest viewport resolution. */
const float *viewport_size = DRW_viewport_size_get();
diff --git a/source/blender/draw/engines/workbench/workbench_effect_dof.c b/source/blender/draw/engines/workbench/workbench_effect_dof.c
index f8223945a31..654587f5060 100644
--- a/source/blender/draw/engines/workbench/workbench_effect_dof.c
+++ b/source/blender/draw/engines/workbench/workbench_effect_dof.c
@@ -156,7 +156,7 @@ void workbench_dof_engine_init(WORKBENCH_Data *vedata)
const float *full_size = DRW_viewport_size_get();
const int size[2] = {max_ii(1, (int)full_size[0] / 2), max_ii(1, (int)full_size[1] / 2)};
-#if 0 /* TODO(fclem) finish COC min_max optimisation */
+#if 0 /* TODO(fclem) finish COC min_max optimization */
/* NOTE: We Ceil here in order to not miss any edge texel if using a NPO2 texture. */
int shrink_h_size[2] = {ceilf(size[0] / 8.0f), size[1]};
int shrink_w_size[2] = {shrink_h_size[0], ceilf(size[1] / 8.0f)};
@@ -168,7 +168,7 @@ void workbench_dof_engine_init(WORKBENCH_Data *vedata)
&txl->coc_halfres_tx, size[0], size[1], GPU_RG8, DRW_TEX_FILTER | DRW_TEX_MIPMAP);
wpd->dof_blur_tx = DRW_texture_pool_query_2d(
size[0], size[1], GPU_RGBA16F, &draw_engine_workbench);
-#if 0 /* TODO(fclem) finish COC min_max optimisation */
+#if 0 /* TODO(fclem) finish COC min_max optimization. */
wpd->coc_temp_tx = DRW_texture_pool_query_2d(
shrink_h_size[0], shrink_h_size[1], GPU_RG8, &draw_engine_workbench);
wpd->coc_tiles_tx[0] = DRW_texture_pool_query_2d(
@@ -183,7 +183,7 @@ void workbench_dof_engine_init(WORKBENCH_Data *vedata)
GPU_ATTACHMENT_TEXTURE(txl->dof_source_tx),
GPU_ATTACHMENT_TEXTURE(txl->coc_halfres_tx),
});
-#if 0 /* TODO(fclem) finish COC min_max optimisation */
+#if 0 /* TODO(fclem) finish COC min_max optimization. */
GPU_framebuffer_ensure_config(&fbl->dof_coc_tile_h_fb,
{
GPU_ATTACHMENT_NONE,
diff --git a/source/blender/gpu/intern/gpu_vertex_buffer_private.hh b/source/blender/gpu/intern/gpu_vertex_buffer_private.hh
index 3cce7e79857..f3450d8e0f7 100644
--- a/source/blender/gpu/intern/gpu_vertex_buffer_private.hh
+++ b/source/blender/gpu/intern/gpu_vertex_buffer_private.hh
@@ -48,11 +48,11 @@ class VertBuf {
uchar *data = NULL;
protected:
- /** Usage hint for GL optimisation. */
+ /** Usage hint for GL optimization. */
GPUUsageType usage_ = GPU_USAGE_STATIC;
private:
- /** This counter will only avoid freeing the GPUVertBuf, not the data. */
+ /** This counter will only avoid freeing the #GPUVertBuf, not the data. */
int handle_refcount_ = 1;
public:
@@ -119,4 +119,4 @@ static inline const VertBuf *unwrap(const GPUVertBuf *vert)
return reinterpret_cast<const VertBuf *>(vert);
}
-} // namespace blender::gpu
\ No newline at end of file
+} // namespace blender::gpu
diff --git a/source/blender/nodes/shader/nodes/node_shader_valToRgb.cc b/source/blender/nodes/shader/nodes/node_shader_valToRgb.cc
index 7b4e568e923..becc4623e9a 100644
--- a/source/blender/nodes/shader/nodes/node_shader_valToRgb.cc
+++ b/source/blender/nodes/shader/nodes/node_shader_valToRgb.cc
@@ -74,7 +74,7 @@ static int gpu_shader_valtorgb(GPUMaterial *mat,
float *array, layer;
int size;
- /* Common / easy case optimisation. */
+ /* Common / easy case optimization. */
if ((coba->tot <= 2) && (coba->color_mode == COLBAND_BLEND_RGB)) {
float mul_bias[2];
switch (coba->ipotype) {
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index bc633daad27..42cc3106eea 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -166,7 +166,7 @@ void bpy_context_clear(bContext *UNUSED(C), const PyGILState_STATE *gilstate)
}
/**
- * Use for `CTX_*_set(..)` funcitons need to set values which are later read back as expected.
+ * Use for `CTX_*_set(..)` functions need to set values which are later read back as expected.
* In this case we don't want the Python context to override the values as it causes problems
* see T66256.
*
More information about the Bf-blender-cvs
mailing list