diff options
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/BLI_dynstr.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/array_store.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/kdtree_impl.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/path_util.c | 8 | ||||
-rw-r--r-- | source/blender/blenlib/intern/polyfill_2d_beautify.c | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenlib/intern/BLI_dynstr.c b/source/blender/blenlib/intern/BLI_dynstr.c index 7b25fecfa45..5255e8b9902 100644 --- a/source/blender/blenlib/intern/BLI_dynstr.c +++ b/source/blender/blenlib/intern/BLI_dynstr.c @@ -166,7 +166,7 @@ void BLI_dynstr_vappendf(DynStr *__restrict ds, const char *__restrict format, v message = MEM_callocN(sizeof(char) * len, "BLI_dynstr_appendf"); } - /* cant reuse the same args, so work on a copy */ + /* can't reuse the same args, so work on a copy */ va_copy(args_cpy, args); retval = vsnprintf(message, len, format, args_cpy); va_end(args_cpy); diff --git a/source/blender/blenlib/intern/array_store.c b/source/blender/blenlib/intern/array_store.c index b694f9c7fc0..250915383cf 100644 --- a/source/blender/blenlib/intern/array_store.c +++ b/source/blender/blenlib/intern/array_store.c @@ -192,7 +192,7 @@ /* Disallow chunks bigger than the regular chunk size scaled by this value * note: must be at least 2! - * however, this code runs wont run in tests unless its ~1.1 ugh. + * however, this code runs won't run in tests unless it's ~1.1 ugh. * so lower only to check splitting works. */ # define BCHUNK_SIZE_MAX_MUL 2 diff --git a/source/blender/blenlib/intern/kdtree_impl.h b/source/blender/blenlib/intern/kdtree_impl.h index c92dc2e95a3..2a0e8b3ec68 100644 --- a/source/blender/blenlib/intern/kdtree_impl.h +++ b/source/blender/blenlib/intern/kdtree_impl.h @@ -882,7 +882,7 @@ static void deduplicate_recursive(const struct DeDuplicateParams *p, uint i) * although it can still be used as a target. * \returns The number of merges found (includes any merges already in the \a duplicates array). * - * \note Merging is always a single step (target indices wont be marked for merging). + * \note Merging is always a single step (target indices won't be marked for merging). */ int BLI_kdtree_nd_(calc_duplicates_fast)(const KDTree *tree, const float range, diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 7de6e9f843a..de50ae27b94 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -6249,7 +6249,7 @@ float cubic_tangent_factor_circle_v3(const float tan_l[3], const float tan_r[3]) const float tan_dot = dot_v3v3(tan_l, tan_r); if (tan_dot > 1.0f - eps) { - /* no angle difference (use fallback, length wont make any difference) */ + /* no angle difference (use fallback, length won't make any difference) */ return (1.0f / 3.0f) * 0.75f; } if (tan_dot < -1.0f + eps) { diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index e8027836ed6..f3c348b2b44 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -180,7 +180,7 @@ void BLI_path_normalize(const char *relabase, char *path) else { if (path[0] == '/' && path[1] == '/') { if (path[2] == '\0') { - return; /* path is "//" - cant clean it */ + return; /* path is "//" - can't clean it */ } path = path + 2; /* leave the initial "//" untouched */ } @@ -236,7 +236,7 @@ void BLI_path_normalize(const char *relabase, char *path) } else { /* support for odd paths: eg /../home/me --> /home/me - * this is a valid path in blender but we cant handle this the usual way below + * this is a valid path in blender but we can't handle this the usual way below * simply strip this prefix then evaluate the path as usual. * pythons os.path.normpath() does this */ @@ -1646,8 +1646,8 @@ bool BLI_path_filename_ensure(char *filepath, size_t maxlen, const char *filenam /** * Converts `/foo/bar.txt` to `/foo/` and `bar.txt` * - * - Wont change \a string. - * - Wont create any directories. + * - Won't change \a string. + * - Won't create any directories. * - Doesn't use CWD, or deal with relative paths. * - Only fill's in \a dir and \a file when they are non NULL. */ diff --git a/source/blender/blenlib/intern/polyfill_2d_beautify.c b/source/blender/blenlib/intern/polyfill_2d_beautify.c index 98fa5c872b0..7425bab885c 100644 --- a/source/blender/blenlib/intern/polyfill_2d_beautify.c +++ b/source/blender/blenlib/intern/polyfill_2d_beautify.c @@ -320,7 +320,7 @@ static void polyedge_rotate(struct HalfEdge *edges, struct HalfEdge *e) * The intention is that this calculates the output of #BLI_polyfill_calc * \note assumes the \a coords form a boundary, * so any edges running along contiguous (wrapped) indices, - * are ignored since the edges wont share 2 faces. + * are ignored since the edges won't share 2 faces. */ void BLI_polyfill_beautify(const float (*coords)[2], const uint coords_tot, |