Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-01-13 05:21:29 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-01-13 05:21:29 +0300
commit92826a921c2f17318bafa4d9dd4b7b7e1ba9c73d (patch)
tree9a5a8874fb8ad8f6f7e4d01a23b6ff088f0d18cb
parentbc584258626249a005a518661aabe080ec25f276 (diff)
Cleanup: spelling
-rw-r--r--source/blender/blenkernel/BKE_cryptomatte.hh2
-rw-r--r--source/blender/blenkernel/intern/nla.c4
-rw-r--r--source/blender/bmesh/tools/bmesh_edgenet.c2
-rw-r--r--source/blender/draw/engines/overlay/overlay_edit_uv.c7
-rw-r--r--source/blender/editors/object/object_edit.c2
-rw-r--r--source/blender/editors/space_node/drawnode.c4
-rw-r--r--source/blender/sequencer/intern/image_cache.c2
7 files changed, 12 insertions, 11 deletions
diff --git a/source/blender/blenkernel/BKE_cryptomatte.hh b/source/blender/blenkernel/BKE_cryptomatte.hh
index 892f228187e..4631bb2616e 100644
--- a/source/blender/blenkernel/BKE_cryptomatte.hh
+++ b/source/blender/blenkernel/BKE_cryptomatte.hh
@@ -51,7 +51,7 @@ std::string BKE_cryptomatte_meta_data_key(const StringRef layer_name,
* A render_pass_name could be 'View Layer.CryptoMaterial02'. The cryptomatte layer would be 'View
* Layer.CryptoMaterial'.
*
- * NOTE: The return type is a substring of `render_pass_name` and therefore cannot outlive the
+ * NOTE: The return type is a sub-string of `render_pass_name` and therefore cannot outlive the
* `render_pass_name` internal data.
*/
StringRef BKE_cryptomatte_extract_layer_name(const StringRef render_pass_name);
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index ecafc76c84d..63b14c30b3c 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -296,8 +296,8 @@ NlaTrack *BKE_nlatrack_add(AnimData *adt, NlaTrack *prev, const bool is_liboverr
nlt->flag = NLATRACK_SELECTED | NLATRACK_OVERRIDELIBRARY_LOCAL;
nlt->index = BLI_listbase_count(&adt->nla_tracks);
- /* In liboverride case, we only add local tracks after all those comming from the linked data, so
- * we need to find the first local track. */
+ /* In liboverride case, we only add local tracks after all those coming from the linked data,
+ * so we need to find the first local track. */
if (is_liboverride && prev != NULL && (prev->flag & NLATRACK_OVERRIDELIBRARY_LOCAL) == 0) {
NlaTrack *first_local = prev->next;
for (; first_local != NULL && (first_local->flag & NLATRACK_OVERRIDELIBRARY_LOCAL) == 0;
diff --git a/source/blender/bmesh/tools/bmesh_edgenet.c b/source/blender/bmesh/tools/bmesh_edgenet.c
index c332d88e83b..1ab37ec0684 100644
--- a/source/blender/bmesh/tools/bmesh_edgenet.c
+++ b/source/blender/bmesh/tools/bmesh_edgenet.c
@@ -60,7 +60,7 @@ static int bm_edge_face(BMEdge *e)
}
/**
- * Get the next available edge we can use to attempt tp calculate a path from.
+ * Get the next available edge we can use to attempt to calculate a path from.
*/
static BMEdge *bm_edgenet_edge_get_next(BMesh *bm,
LinkNode **edge_queue,
diff --git a/source/blender/draw/engines/overlay/overlay_edit_uv.c b/source/blender/draw/engines/overlay/overlay_edit_uv.c
index edc817ac7c1..1899fb114a0 100644
--- a/source/blender/draw/engines/overlay/overlay_edit_uv.c
+++ b/source/blender/draw/engines/overlay/overlay_edit_uv.c
@@ -165,9 +165,10 @@ void OVERLAY_edit_uv_init(OVERLAY_Data *vedata)
pd->edit_uv.total_area_ratio = 0.0f;
pd->edit_uv.total_area_ratio_inv = 0.0f;
- /* During engine init phase the sima isn't locked and we are able to retrieve the needed data.
- * During cache_init the image engine locks the sima and makes it imposible to retrieve the data.
- */
+ /* During engine initialization phase the `sima` isn't locked and
+ * we are able to retrieve the needed data.
+ * During cache_init the image engine locks the `sima` and makes it impossible
+ * to retrieve the data. */
ED_space_image_get_uv_aspect(sima, &pd->edit_uv.uv_aspect[0], &pd->edit_uv.uv_aspect[1]);
ED_space_image_get_size(sima, &pd->edit_uv.image_size[0], &pd->edit_uv.image_size[1]);
ED_space_image_get_aspect(sima, &pd->edit_uv.image_aspect[0], &pd->edit_uv.image_aspect[1]);
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index c6a70f9b866..41886dd1dcd 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -1931,7 +1931,7 @@ static int move_to_collection_invoke(bContext *C, wmOperator *op, const wmEvent
Collection *master_collection = scene->master_collection;
/* We need the data to be allocated so it's available during menu drawing.
- * Technically we could use wmOperator->customdata. However there is no free callback
+ * Technically we could use #wmOperator.customdata. However there is no free callback
* called to an operator that exit with OPERATOR_INTERFACE to launch a menu.
*
* So we are left with a memory that will necessarily leak. It's a small leak though.*/
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 0933efb1577..9e07c3d667b 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -3238,8 +3238,8 @@ static void node_geometry_buts_attribute_vector_math(uiLayout *layout,
uiItemR(layout, ptr, "operation", DEFAULT_FLAGS, "", ICON_NONE);
uiItemR(layout, ptr, "input_type_a", DEFAULT_FLAGS, IFACE_("Type A"), ICON_NONE);
- /* These "use input b / c" checks are copied from the node's code. They could be deduplicated if
- * the drawing code was moved to the node's file. */
+ /* These "use input b / c" checks are copied from the node's code.
+ * They could be de-duplicated if the drawing code was moved to the node's file. */
if (!ELEM(node_storage->operation,
NODE_VECTOR_MATH_NORMALIZE,
NODE_VECTOR_MATH_FLOOR,
diff --git a/source/blender/sequencer/intern/image_cache.c b/source/blender/sequencer/intern/image_cache.c
index 6818df6a986..344b5af26aa 100644
--- a/source/blender/sequencer/intern/image_cache.c
+++ b/source/blender/sequencer/intern/image_cache.c
@@ -622,7 +622,7 @@ static bool seq_disk_cache_write_file(SeqDiskCache *disk_cache, SeqCacheKey *key
DiskCacheFile *cache_file = seq_disk_cache_get_file_entry_by_path(disk_cache, path);
DiskCacheHeader header;
memset(&header, 0, sizeof(header));
- /* BLI_make_existing_file() above may create an empty file. This is fine, don't atttempt reading
+ /* #BLI_make_existing_file() above may create an empty file. This is fine, don't attempt reading
* the header in that case. */
if (cache_file->fstat.st_size != 0 && !seq_disk_cache_read_header(file, &header)) {
fclose(file);