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:
authorBastien Montagne <montagne29@wanadoo.fr>2018-12-24 14:31:39 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-12-24 14:32:43 +0300
commit1ac311cedc1a4694a3dd410776296747f8625e1d (patch)
tree806e6d748737bbec23462e74d74b442438b85c3e /source/blender/blenlib/intern
parent410142caffd1df20463925251f4925d5f105f23d (diff)
Fix/cleanup another bunch of UI messages issues.
Also (mostly in comments): behaviour -> behavior (we use American English).
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r--source/blender/blenlib/intern/list_sort_impl.h2
-rw-r--r--source/blender/blenlib/intern/path_util.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenlib/intern/list_sort_impl.h b/source/blender/blenlib/intern/list_sort_impl.h
index 249ed470d6e..062b4e39647 100644
--- a/source/blender/blenlib/intern/list_sort_impl.h
+++ b/source/blender/blenlib/intern/list_sort_impl.h
@@ -226,7 +226,7 @@ BLI_INLINE list_node *sweep_up(struct SortInfo *si, list_node *list, unsigned in
* When inserting higher-ranked lists, we choose to clear out the lower ranks
* in the interests of keeping the sort stable, but this makes analysis harder.
* Note that clearing the lower-ranked lists is `O(length(list))--` thus it
- * shouldn't affect the `O(n log n)` behaviour.
+ * shouldn't affect the `O(n log n)` behavior.
* In other words, inserting one `rank-i` list is equivalent to inserting
* `2**i` `rank-0` lists, thus even if we do `i` additional merges
* in the clearing-out (taking at most `2**i` time) we are still fine.
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index 2461a6ed50b..5c9a56e33d2 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -243,7 +243,7 @@ void BLI_cleanup_path(const char *relabase, char *path)
/* Note: previous version of following call used an offset of 3 instead of 4,
* which meant that the "/../home/me" example actually became "home/me".
- * Using offset of 3 gives behaviour consistent with the abovementioned
+ * Using offset of 3 gives behavior consistent with the abovementioned
* Python routine. */
memmove(path, path + 3, strlen(path + 3) + 1);
}