[Bf-blender-cvs] [9e96c6d0548] master: Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Fri Jun 5 06:38:40 CEST 2020
Commit: 9e96c6d05488370cd74c89b69b306da6f5e4de69
Author: Campbell Barton
Date: Fri Jun 5 14:34:00 2020 +1000
Branches: master
https://developer.blender.org/rB9e96c6d05488370cd74c89b69b306da6f5e4de69
Cleanup: spelling
===================================================================
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/unit.c
M source/blender/blenlib/BLI_task.h
M source/blender/blenlib/intern/BLI_kdopbvh.c
M source/blender/blenloader/BLO_undofile.h
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_290.c
M source/blender/blenloader/intern/writefile.c
M source/blender/draw/engines/eevee/eevee_materials.c
M source/blender/draw/engines/eevee/eevee_private.h
M source/blender/draw/engines/eevee/eevee_renderpasses.c
M source/blender/draw/engines/eevee/eevee_shaders.c
M source/blender/draw/intern/draw_cache_extract_mesh.c
M source/blender/editors/interface/view2d_draw.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/freestyle/intern/view_map/Silhouette.h
M source/blender/gpu/intern/gpu_extensions.c
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesrna/intern/rna_fluid.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index a7bf345567f..ad67ee290b0 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -214,10 +214,10 @@ typedef struct ModifierTypeInfo {
/********************* Non-deform modifier functions *********************/
- /* For non-deform types: apply the modifier and return a mesh datablock.
+ /* For non-deform types: apply the modifier and return a mesh data-block.
*
* The mesh argument should always be non-NULL; the modifier should use the
- * passed in mesh datablock rather than object->data, as it contains the mesh
+ * passed in mesh data-block rather than object->data, as it contains the mesh
* with modifier applied up to this point.
*
* The modifier may modify and return the mesh argument, but must not free it
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 015c67806c6..eb485e1522f 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -4783,11 +4783,11 @@ void psys_get_dupli_texture(ParticleSystem *psys,
/* XXX: on checking '(psmd->dm != NULL)'
* This is incorrect but needed for metaball evaluation.
- * Ideally this would be calculated via the depsgraph, however with metaballs,
+ * Ideally this would be calculated via the depsgraph, however with meta-balls,
* the entire scenes dupli's are scanned, which also looks into uncalculated data.
*
* For now just include this workaround as an alternative to crashing,
- * but longer term metaballs should behave in a more manageable way, see: T46622. */
+ * but longer term meta-balls should behave in a more manageable way, see: T46622. */
uv[0] = uv[1] = 0.f;
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c
index a8136dd7932..f37feab4b85 100644
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@ -716,7 +716,7 @@ static bool ch_is_op(char op)
/**
* Helper function for #unit_distribute_negatives to find the next negative to distribute.
*
- * \note This unecessarily skips the next space if it comes right after the "-"
+ * \note This unnecessarily skips the next space if it comes right after the "-"
* just to make a more predictable output.
*/
static char *find_next_negative(const char *str, const char *remaining_str)
@@ -742,7 +742,7 @@ static char *find_next_negative(const char *str, const char *remaining_str)
/**
* Helper function for #unit_distribute_negatives to find the next operation, including "-".
*
- * \note This unecessarily skips the space before the operation character
+ * \note This unnecessarily skips the space before the operation character
* just to make a more predictable output.
*/
static char *find_next_op(const char *str, char *remaining_str, int len_max)
diff --git a/source/blender/blenlib/BLI_task.h b/source/blender/blenlib/BLI_task.h
index a4a855c354b..eee304a9b72 100644
--- a/source/blender/blenlib/BLI_task.h
+++ b/source/blender/blenlib/BLI_task.h
@@ -286,7 +286,7 @@ int BLI_task_parallel_thread_id(const TaskParallelTLS *tls);
* ** Task-Data **
*
* Typically you want give a task data to work on.
- * Task data can be shared with other nodes, but be carefull not to free the data multiple times.
+ * Task data can be shared with other nodes, but be careful not to free the data multiple times.
* Task data is freed when calling `BLI_task_graph_free`.
*
* MyData *task_data = MEM_callocN(sizeof(MyData), __func__);
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index 3a07cef7cac..da67baf0ead 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -719,10 +719,10 @@ static void non_recursive_bvh_div_nodes_task_cb(void *__restrict userdata,
refit_kdop_hull(data->tree, parent, parent_leafs_begin, parent_leafs_end);
split_axis = get_largest_axis(parent->bv);
- /* Save split axis (this can be used on raytracing to speedup the query time) */
+ /* Save split axis (this can be used on ray-tracing to speedup the query time) */
parent->main_axis = split_axis / 2;
- /* Split the childs along the split_axis, note: its not needed to sort the whole leafs array
+ /* Split the children along the split_axis, note: its not needed to sort the whole leafs array
* Only to assure that the elements are partitioned on a way that each child takes the elements
* it would take in case the whole array was sorted.
* Split_leafs takes care of that "sort" problem. */
diff --git a/source/blender/blenloader/BLO_undofile.h b/source/blender/blenloader/BLO_undofile.h
index 175aa4ab9d0..f9300f8a521 100644
--- a/source/blender/blenloader/BLO_undofile.h
+++ b/source/blender/blenloader/BLO_undofile.h
@@ -39,7 +39,7 @@ typedef struct {
* detect unchanged IDs).
* Defined when writing the next step (i.e. last undo step has those always false). */
bool is_identical_future;
- /** Session uuid of the ID being curently written (MAIN_ID_SESSION_UUID_UNSET when not writing
+ /** Session UUID of the ID being currently written (MAIN_ID_SESSION_UUID_UNSET when not writing
* ID-related data). Used to find matching chunks in previous memundo step. */
uint id_session_uuid;
} MemFileChunk;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index db0187d0486..501e8de678d 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2890,8 +2890,8 @@ static void direct_link_id_common(
id->tag = tag;
if (tag & LIB_TAG_ID_LINK_PLACEHOLDER) {
- /* For placeholder we only need to set the tag and properly init generic ID fieds above, no
- * further data to read. */
+ /* For placeholder we only need to set the tag and properly initialize generic ID fields above,
+ * no further data to read. */
return;
}
diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c
index 1aa569d8336..ed23b69c623 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -244,7 +244,7 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
if (!MAIN_VERSION_ATLEAST(bmain, 290, 4)) {
- /* Clear old deprecated bitflag from edit weights modifiers, we now use it for something else.
+ /* Clear old deprecated bit-flag from edit weights modifiers, we now use it for something else.
*/
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index ca46579099f..70d4d1ba5ed 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -4183,7 +4183,7 @@ static bool write_file_handle(Main *mainvar,
memcpy(id_buffer, id, idtype_struct_size);
((ID *)id_buffer)->tag = 0;
- /* Those listbase data change everytime we add/remove an ID, and also often when renaming
+ /* Those listbase data change every time we add/remove an ID, and also often when renaming
* one (due to re-sorting). This avoids generating a lot of false 'is changed' detections
* between undo steps. */
((ID *)id_buffer)->prev = NULL;
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 0f10fb0ef53..cfc70baaf01 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -563,9 +563,9 @@ static EeveeMaterialCache material_opaque(EEVEE_Data *vedata,
const bool use_depth_shader = use_gpumat && ELEM(ma->blend_method, MA_BM_CLIP, MA_BM_HASHED);
/* HACK: Assume the struct will never be smaller than our variations.
- * This allow us to only keep one ghash and avoid bigger keys comparissons/hashing. */
+ * This allow us to only keep one ghash and avoid bigger keys comparisons/hashing. */
void *key = (char *)ma + is_hair;
- /* Search for other material instances (sharing the same Material datablock). */
+ /* Search for other material instances (sharing the same Material data-block). */
EeveeMaterialCache **emc_p, *emc;
if (BLI_ghash_ensure_p(pd->material_hash, key, (void ***)&emc_p)) {
return **emc_p;
@@ -641,7 +641,7 @@ static EeveeMaterialCache material_opaque(EEVEE_Data *vedata,
/* Search for the same shaders usage in the pass. */
/* HACK: Assume the struct will never be smaller than our variations.
- * This allow us to only keep one ghash and avoid bigger keys comparissons/hashing. */
+ * This allow us to only keep one ghash and avoid bigger keys comparisons/hashing. */
BLI_assert(option <= 16);
struct GPUShader *sh = GPU_material_get_shader(gpumat);
void *cache_key = (char *)sh + option;
diff --git a/source/blender/draw/engines/eevee/eevee_private.h b/source/blender/draw/engines/eevee/eevee_private.h
index dbe2adef789..40008c5c364 100644
--- a/source/blender/draw/engines/eevee/eevee_private.h
+++ b/source/blender/draw/engines/eevee/eevee_private.h
@@ -180,7 +180,7 @@ enum {
/* Material shader cache keys */
enum {
/* HACK: This assumes the struct GPUShader will never be smaller than our variations.
- * This allow us to only keep one ghash and avoid bigger keys comparissons/hashing.
+ * This allow us to only keep one ghash and avoid bigger keys comparisons/hashing.
* We combine the GPUShader pointer with the key. */
KEY_CULL = (1 << 0),
KEY_REFRACT = (1 << 1),
diff --git a/source/blender/draw/engines/eevee/eevee_renderpasses.c b/source/blender/draw/engines/eevee/eevee_renderpasses.c
index 4a1880caf7d..9a47ca19e7b 100644
--- a/source/blender/draw/engines/eevee/eevee_renderpasses.c
+++ b/source/blender/draw/engines/eevee/eevee_renderpasses.c
@@ -215,7
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list