[Bf-blender-cvs] [d8a7e5ee324] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Thu Sep 19 05:21:23 CEST 2019
Commit: d8a7e5ee324ef4648a317ef232aae5b5a8ed991f
Author: Campbell Barton
Date: Thu Sep 19 13:18:52 2019 +1000
Branches: master
https://developer.blender.org/rBd8a7e5ee324ef4648a317ef232aae5b5a8ed991f
Cleanup: spelling
===================================================================
M intern/cycles/kernel/osl/osl_services.cpp
M intern/cycles/kernel/svm/svm_noise.h
M source/blender/blenkernel/intern/library.c
M source/blender/blenlib/BLI_array_ref.h
M source/blender/blenlib/intern/fileops.c
M source/blender/blenloader/intern/versioning_cycles.c
M source/blender/draw/engines/eevee/eevee_shadows.c
M source/blender/draw/engines/eevee/eevee_subsurface.c
M source/blender/draw/engines/eevee/eevee_volumes.c
M source/blender/draw/engines/select/select_draw_utils.c
M source/blender/draw/intern/draw_manager.h
M source/blender/draw/intern/draw_manager_data.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/interface/view2d.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/transform/transform_convert_graph.c
M source/blender/makesdna/DNA_scene_defaults.h
M source/blender/windowmanager/WM_types.h
M source/creator/creator_args.c
===================================================================
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp
index 2698ed59e64..1b161fbc8ee 100644
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/osl_services.cpp
@@ -483,11 +483,11 @@ static bool set_attribute_float3(float3 f, TypeDesc type, bool derivatives, void
return set_attribute_float3(fv, type, derivatives, val);
}
-/* Attributes with the TypeRGBA type descriptor should be retrived and stored
+/* Attributes with the TypeRGBA type descriptor should be retrieved and stored
* in a float array of size 4 (e.g. node_vertex_color.osl), this array have
* a type descriptor TypeFloatArray4. If the storage is not a TypeFloatArray4,
* we either store the first three components in a vector, store the average of
- * the components in a float, or fail the retrival and do nothing. We allow
+ * the components in a float, or fail the retrieval and do nothing. We allow
* this for the correct operation of the Attribute node.
*/
diff --git a/intern/cycles/kernel/svm/svm_noise.h b/intern/cycles/kernel/svm/svm_noise.h
index b67c1e9cb7e..a16b226d8de 100644
--- a/intern/cycles/kernel/svm/svm_noise.h
+++ b/intern/cycles/kernel/svm/svm_noise.h
@@ -313,7 +313,7 @@ ccl_device_inline ssef bi_mix(ssef p, ssef f)
* (s2, s3) is generated by moving v2 and v3 to the first and second
* places of the ssef using the shuffle mask <2, 3, 2, 3>. The third and
* fourth values are unused.
- * 3. Interplate g0 and g1 along the z axis to get the final value.
+ * 3. Interpolate g0 and g1 along the z axis to get the final value.
* g1 is generated by populating an ssef with the second value of g.
* Only the first value is important in the final ssef.
*
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 6eb9de7aaf0..367c2fbbdda 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1476,7 +1476,7 @@ void BKE_libblock_copy_ex(Main *bmain, const ID *id, ID **r_newid, const int ori
/* the duplicate should get a copy of the animdata */
if ((flag & LIB_ID_COPY_NO_ANIMDATA) == 0) {
/* Note that even though horrors like root nodetrees are not in bmain, the actions they use
- * in their anim data *are* in bmain... super-mega-hurra. */
+ * in their anim data *are* in bmain... super-mega-hooray. */
int animdata_flag = orig_flag;
BLI_assert((animdata_flag & LIB_ID_COPY_ACTIONS) == 0 ||
(animdata_flag & LIB_ID_CREATE_NO_MAIN) == 0);
diff --git a/source/blender/blenlib/BLI_array_ref.h b/source/blender/blenlib/BLI_array_ref.h
index 1373a0da355..e34647676d8 100644
--- a/source/blender/blenlib/BLI_array_ref.h
+++ b/source/blender/blenlib/BLI_array_ref.h
@@ -21,17 +21,17 @@
* \ingroup bli
*
* These classes offer a convenient way to work with continuous chunks of memory of a certain type.
- * We differentiate ArrayRef and MutableArrayRef. The elements in the former are const while the
+ * We differentiate #ArrayRef and #MutableArrayRef. The elements in the former are const while the
* elements in the other are not.
*
* Passing array references as parameters has multiple benefits:
* - Less templates are used because the function does not have to work with different
* container types.
- * - It encourages an Struct-of-Arrays data layout which is often benefitial when
+ * - It encourages an Struct-of-Arrays data layout which is often beneficial when
* writing high performance code. Also it makes it easier to reuse code.
* - Array references offer convenient ways of slicing and other operations.
*
- * The instances of ArrayRef and MutableArrayRef are very small and should be passed by value.
+ * The instances of #ArrayRef and #MutableArrayRef are very small and should be passed by value.
* Since array references do not own any memory, it is generally not save to store them.
*/
@@ -202,7 +202,7 @@ template<typename T> class ArrayRef {
/**
* Does a linear search to count how often the value is in the array.
- * Returns the number of occurences.
+ * Returns the number of occurrences.
*/
uint count(const T &value) const
{
@@ -226,7 +226,7 @@ template<typename T> class ArrayRef {
}
/**
- * Return a reference to the last elemeent in the array.
+ * Return a reference to the last element in the array.
* Asserts that the array is not empty.
*/
const T &last() const
@@ -363,7 +363,7 @@ template<typename T> class MutableArrayRef {
/**
* Return a continuous part of the array.
- * Aserts that the slice stays in the array bounds.
+ * Asserts that the slice stays in the array bounds.
*/
MutableArrayRef slice(uint start, uint length) const
{
diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c
index 1de8744a6a6..99149f5ea42 100644
--- a/source/blender/blenlib/intern/fileops.c
+++ b/source/blender/blenlib/intern/fileops.c
@@ -770,7 +770,7 @@ int BLI_delete(const char *file, bool dir, bool recursive)
}
/**
- * Do the two paths denote the same filesystem object?
+ * Do the two paths denote the same file-system object?
*/
static bool check_the_same(const char *path_a, const char *path_b)
{
diff --git a/source/blender/blenloader/intern/versioning_cycles.c b/source/blender/blenloader/intern/versioning_cycles.c
index 3325484e9a0..2c4ba4a1102 100644
--- a/source/blender/blenloader/intern/versioning_cycles.c
+++ b/source/blender/blenloader/intern/versioning_cycles.c
@@ -1092,12 +1092,13 @@ static void update_voronoi_node_crackle(bNodeTree *ntree)
}
}
-/* The coloring property of the Voronoi node was removed. Previously,
+/**
+ * The coloring property of the Voronoi node was removed. Previously,
* if the coloring enum was set to Intensity (0), the voronoi distance
* was returned in all outputs, otherwise, the Cell ID was returned.
* Since we remapped the Fac output in update_voronoi_node_fac_output,
* then to fix this, we relink the Color output to the Distance
- * output if coloring was set to 0, and the otherway around otherwise.
+ * output if coloring was set to 0, and the other way around otherwise.
*/
static void update_voronoi_node_coloring(bNodeTree *ntree)
{
diff --git a/source/blender/draw/engines/eevee/eevee_shadows.c b/source/blender/draw/engines/eevee/eevee_shadows.c
index 257ec6bc8f0..46fc6e07c1c 100644
--- a/source/blender/draw/engines/eevee/eevee_shadows.c
+++ b/source/blender/draw/engines/eevee/eevee_shadows.c
@@ -163,7 +163,7 @@ void EEVEE_shadows_caster_material_add(EEVEE_ViewLayerData *sldata,
return;
}
- /* Grrr needed for correctness but not 99% of the time not needed.
+ /* Unfortunately needed for correctness but not 99% of the time not needed.
* TODO detect when needed? */
DRW_shgroup_uniform_block(grp, "probe_block", sldata->probe_ubo);
DRW_shgroup_uniform_block(grp, "grid_block", sldata->grid_ubo);
diff --git a/source/blender/draw/engines/eevee/eevee_subsurface.c b/source/blender/draw/engines/eevee/eevee_subsurface.c
index 30ad8482f76..8376b8c67b8 100644
--- a/source/blender/draw/engines/eevee/eevee_subsurface.c
+++ b/source/blender/draw/engines/eevee/eevee_subsurface.c
@@ -356,7 +356,7 @@ void EEVEE_subsurface_compute(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
}
if (!DRW_pass_is_empty(psl->sss_translucency_ps)) {
- /* We sample the shadowmaps using normal sampler. We need to disable Comparison mode.
+ /* We sample the shadow-maps using normal sampler. We need to disable Comparison mode.
* TODO(fclem) avoid this by using sampler objects.*/
GPU_texture_bind(sldata->shadow_cube_pool, 0);
GPU_texture_compare_mode(sldata->shadow_cube_pool, false);
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index cfebe48a836..711c956ce4b 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -632,7 +632,7 @@ void EEVEE_volumes_compute(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata)
int tex_transmit = GPU_texture_opengl_bindcode(txl->volume_transmit_history);
/* TODO(fclem) Encapsulate these GL calls into DRWManager. */
glMemoryBarrier(GL_SHADER_IMAGE_ACCESS_BARRIER_BIT);
- /* Subtility here! we need to tell the GL that the texture is layered (GL_TRUE)
+ /* Subtlety here! we need to tell the GL that the texture is layered (GL_TRUE)
* in order to bind the full 3D texture and not just a 2D slice. */
glBindImageTexture(0, tex_scatter, 0, GL_TRUE, 0, GL_WRITE_ONLY, GL_R11F_G11F_B10F);
glBindImageTexture(1, tex_transmit, 0, GL_TRUE, 0, GL_WRITE_ONLY, GL_R11F_G11F_B10F);
diff --git a/source/blender/draw/engines/select/select_draw_utils.c b/source/blender/draw/engines/select/select_draw_utils.c
index cac8b5cb304..0203b6cbebf 100644
--- a/source/blender/draw/engines/select/select_draw_utils.c
+++ b/source/blender/draw/engines/select/select_draw_utils.c
@@ -63,10 +63,10 @@ short select_id_get_object_select_mode(Scene *scene, Object *ob)
{
short r_select_mode = 0;
if (ob->mode & (OB_MODE_WEIGHT_PAINT | OB_MODE_VERTEX_PAINT | OB_MODE_TEXTURE_PAINT)) {
- /* In order to sample flat colors for vertex weights / texturepaint / vertexpaint
+ /* In order to sample flat colors for vertex weights / texture-paint / vertex-paint
* we need to be in SCE_SELECT_FACE mode so select_cache_init() correctly sets up
* a shgroup with select_id_flat.
- * Note this is not working correctly for vertexpaint (yet), but has been discussed
+ * Note this is not working correctly for vertex-paint (yet), but has been discussed
* in T66645 and there is a solution by @mano-wii in P1032.
* So OB_MODE_VERTEX_PAINT is already included here [required for P1032 I guess]. */
Mesh *me_orig = DEG_get_original_object(ob)->data;
diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h
index b55a84b2765..709116c78e5 100644
--- a/source/blender/draw/intern/draw_manager.h
+++ b
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list