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>2020-05-09 10:15:25 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-05-09 10:19:28 +0300
commitd06384aa41837b905fac94b7cd888dce6c99a3b8 (patch)
treed96b8641e0e3e6cd316990096e900497951be202 /source/blender/blenlib
parent00e99959d3fd40da2ca4a10219705d2fb96efe70 (diff)
Cleanup: spelling
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r--source/blender/blenlib/BLI_linear_allocator.hh4
-rw-r--r--source/blender/blenlib/BLI_scanfill.h8
-rw-r--r--source/blender/blenlib/BLI_task.h2
-rw-r--r--source/blender/blenlib/intern/task_pool.cc2
-rw-r--r--source/blender/blenlib/intern/task_scheduler.cc2
5 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenlib/BLI_linear_allocator.hh b/source/blender/blenlib/BLI_linear_allocator.hh
index ffa81b3ac6b..285af49f500 100644
--- a/source/blender/blenlib/BLI_linear_allocator.hh
+++ b/source/blender/blenlib/BLI_linear_allocator.hh
@@ -114,8 +114,8 @@ template<typename Allocator = GuardedAllocator> class LinearAllocator : NonCopya
*
* Arguments passed to this method will be forwarded to the constructor of T.
*
- * You must not call `delete` on the returned pointer. Instead, the destructor has to be called
- * explicitely.
+ * You must not call `delete` on the returned pointer.
+ * Instead, the destruct has to be called explicitly.
*/
template<typename T, typename... Args> T *construct(Args &&... args)
{
diff --git a/source/blender/blenlib/BLI_scanfill.h b/source/blender/blenlib/BLI_scanfill.h
index 39d3a679eb3..376ea9d88de 100644
--- a/source/blender/blenlib/BLI_scanfill.h
+++ b/source/blender/blenlib/BLI_scanfill.h
@@ -36,7 +36,7 @@ typedef struct ScanFillContext {
ListBase fillfacebase;
/* increment this value before adding each curve to skip having to calculate
- * 'poly_nr' for edges and verts (which can take approx half scanfill time) */
+ * 'poly_nr' for edges and verts (which can take approx half scan-fill time) */
unsigned short poly_nr;
/* private */
@@ -46,9 +46,9 @@ typedef struct ScanFillContext {
#define BLI_SCANFILL_ARENA_SIZE MEM_SIZE_OPTIMAL(1 << 14)
/**
- * \note this is USHRT_MAX so incrementing will set to zero
+ * \note this is USHRT_MAX so incrementing will set to zero
* which happens if callers choose to increment #ScanFillContext.poly_nr before adding each curve.
- * Nowhere else in scanfill do we make use of intentional overflow like this.
+ * Nowhere else in scan-fill do we make use of intentional overflow like this.
*/
#define SF_POLY_UNSET ((unsigned short)-1)
@@ -64,7 +64,7 @@ typedef struct ScanFillVert {
float co[3];
/** 2D projection of vertex location */
float xy[2];
- /** index, caller can use how it likes to match the scanfill result with own data */
+ /** index, caller can use how it likes to match the scan-fill result with own data */
unsigned int keyindex;
unsigned short poly_nr;
/** number of edges using this vertex */
diff --git a/source/blender/blenlib/BLI_task.h b/source/blender/blenlib/BLI_task.h
index ce18d5d765e..3ef693ac62a 100644
--- a/source/blender/blenlib/BLI_task.h
+++ b/source/blender/blenlib/BLI_task.h
@@ -218,7 +218,7 @@ BLI_INLINE void BLI_parallel_range_settings_defaults(TaskParallelSettings *setti
}
/* Don't use this, store any thread specific data in tls->userdata_chunk instead.
- * Ony here for code to be removed. */
+ * Only here for code to be removed. */
int BLI_task_parallel_thread_id(const TaskParallelTLS *tls);
#ifdef __cplusplus
diff --git a/source/blender/blenlib/intern/task_pool.cc b/source/blender/blenlib/intern/task_pool.cc
index b97db30d64f..d8e90af551a 100644
--- a/source/blender/blenlib/intern/task_pool.cc
+++ b/source/blender/blenlib/intern/task_pool.cc
@@ -443,7 +443,7 @@ TaskPool *BLI_task_pool_create_no_threads(void *userdata)
}
/**
- * Task pool that executeds one task after the other, possibly on different threads
+ * Task pool that executes one task after the other, possibly on different threads
* but never in parallel.
*/
TaskPool *BLI_task_pool_create_background_serial(void *userdata, TaskPriority priority)
diff --git a/source/blender/blenlib/intern/task_scheduler.cc b/source/blender/blenlib/intern/task_scheduler.cc
index 325056d41ee..b0245da0385 100644
--- a/source/blender/blenlib/intern/task_scheduler.cc
+++ b/source/blender/blenlib/intern/task_scheduler.cc
@@ -54,7 +54,7 @@ void BLI_task_scheduler_init()
task_scheduler_num_threads = num_threads_override;
}
else {
- /* Let TBB choose the number of threads. For (legacy) code that calss
+ /* Let TBB choose the number of threads. For (legacy) code that calls
* BLI_task_scheduler_num_threads() we provide the system thread count.
* Ideally such code should be rewritten not to use the number of threads
* at all. */