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>2012-03-01 16:20:18 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-01 16:20:18 +0400
commitea13ec1699bcf59960daa57fd2cd9d24e195a71b (patch)
tree8f3b48f2b535426b425388181ed0b9a598ca2d06 /source/blender/blenlib
parent6a36b6249b8dc5bd0f60572fdbc2e42e79c14981 (diff)
Spelling Cleanup
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r--source/blender/blenlib/BLI_array.h2
-rw-r--r--source/blender/blenlib/BLI_dlrbTree.h4
-rw-r--r--source/blender/blenlib/BLI_kdtree.h2
-rw-r--r--source/blender/blenlib/BLI_string.h2
-rw-r--r--source/blender/blenlib/PIL_time.h2
-rw-r--r--source/blender/blenlib/intern/BLI_kdopbvh.c4
-rw-r--r--source/blender/blenlib/intern/boxpack2d.c2
-rw-r--r--source/blender/blenlib/intern/math_geom.c2
-rw-r--r--source/blender/blenlib/intern/path_util.c6
-rw-r--r--source/blender/blenlib/intern/string.c6
-rw-r--r--source/blender/blenlib/intern/voxel.c2
11 files changed, 17 insertions, 17 deletions
diff --git a/source/blender/blenlib/BLI_array.h b/source/blender/blenlib/BLI_array.h
index 9fa66e91393..a8a7cf39066 100644
--- a/source/blender/blenlib/BLI_array.h
+++ b/source/blender/blenlib/BLI_array.h
@@ -51,7 +51,7 @@
*
* arrays are buffered, using double-buffering (so on each reallocation,
* the array size is doubled). supposedly this should give good Big Oh
- * behaviour, though it may not be the best in practice.
+ * behavior, though it may not be the best in practice.
*/
#define BLI_array_declare(arr) \
diff --git a/source/blender/blenlib/BLI_dlrbTree.h b/source/blender/blenlib/BLI_dlrbTree.h
index f048e319d5d..9cb5686131e 100644
--- a/source/blender/blenlib/BLI_dlrbTree.h
+++ b/source/blender/blenlib/BLI_dlrbTree.h
@@ -77,7 +77,7 @@ typedef struct DLRBT_Tree {
/* return -1, 0, 1 for whether the given data is less than, equal to, or greater than the given node
* - node: <DLRBT_Node> the node to compare to
- * - data: pointer to the relevant data or values stored in the bitpattern dependant on the function
+ * - data: pointer to the relevant data or values stored in the bitpattern dependent on the function
*/
typedef short (*DLRBT_Comparator_FP)(void *node, void *data);
@@ -88,7 +88,7 @@ typedef DLRBT_Node *(*DLRBT_NAlloc_FP)(void *data);
/* update an existing node instance accordingly to be in sync with the given data *
* - node: <DLRBT_Node> the node to update
- * - data: pointer to the relevant data or values stored in the bitpattern dependant on the function
+ * - data: pointer to the relevant data or values stored in the bitpattern dependent on the function
*/
typedef void (*DLRBT_NUpdate_FP)(void *node, void *data);
diff --git a/source/blender/blenlib/BLI_kdtree.h b/source/blender/blenlib/BLI_kdtree.h
index 0ec514b4480..a58f58020d7 100644
--- a/source/blender/blenlib/BLI_kdtree.h
+++ b/source/blender/blenlib/BLI_kdtree.h
@@ -31,7 +31,7 @@
/** \file BLI_kdtree.h
* \ingroup bli
- * \brief A kd-tree for nearest neighbour search.
+ * \brief A kd-tree for nearest neighbor search.
* \author Janne Karhu
* \author Brecht van Lommel
*/
diff --git a/source/blender/blenlib/BLI_string.h b/source/blender/blenlib/BLI_string.h
index 25eb2ebecc2..0f419920b21 100644
--- a/source/blender/blenlib/BLI_string.h
+++ b/source/blender/blenlib/BLI_string.h
@@ -92,7 +92,7 @@ char *BLI_getQuotedStr(const char *str, const char *prefix);
* string with all instances of oldText replaced with newText,
* and returns it.
*
- * @param str The string to replace occurances of oldText in
+ * @param str The string to replace occurrences of oldText in
* @param oldText The text in the string to find and replace
* @param newText The text in the string to find and replace
* @retval Returns the duplicated string
diff --git a/source/blender/blenlib/PIL_time.h b/source/blender/blenlib/PIL_time.h
index fa2ad8644e9..cef7ba436bc 100644
--- a/source/blender/blenlib/PIL_time.h
+++ b/source/blender/blenlib/PIL_time.h
@@ -42,7 +42,7 @@ extern "C" {
extern
/** Return an indication of time, expressed as
* seconds since some fixed point. Successive calls
- * are guarenteed to generate values greator than or
+ * are guarenteed to generate values greater than or
* equal to the last call.
*/
double PIL_check_seconds_timer (void);
diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c
index f01777bdce1..9ce58aba5b8 100644
--- a/source/blender/blenlib/intern/BLI_kdopbvh.c
+++ b/source/blender/blenlib/intern/BLI_kdopbvh.c
@@ -663,7 +663,7 @@ static int implicit_leafs_index(BVHBuildHelper *data, int depth, int child_index
* Advantages of the used trees include:
* - No need to store child/parent relations (they are implicit);
* - Any node child always has an index greater than the parent;
- * - Brother nodes are sequencial in memory;
+ * - Brother nodes are sequential in memory;
*
*
* Some math relations derived for general implicit trees:
@@ -688,7 +688,7 @@ static int implicit_needed_branches(int tree_type, int leafs)
*
* It arranges the elements in the given partitions such that:
* - any element in partition N is less or equal to any element in partition N+1.
- * - if all elements are diferent all partition will get the same subset of elements
+ * - if all elements are different all partition will get the same subset of elements
* as if the array was sorted.
*
* partition P is described as the elements in the range ( nth[P] , nth[P+1] ]
diff --git a/source/blender/blenlib/intern/boxpack2d.c b/source/blender/blenlib/intern/boxpack2d.c
index cf18fbd57cd..57174d0c0dd 100644
--- a/source/blender/blenlib/intern/boxpack2d.c
+++ b/source/blender/blenlib/intern/boxpack2d.c
@@ -295,7 +295,7 @@ void boxPack2D(boxPack *boxarray, const int len, float *tot_width, float *tot_he
isect = 1;
} else {
/* do a full search for colliding box
- * this is really slow, some spacialy divided
+ * this is really slow, some spatially divided
* data-structure would be better */
for (box_test=boxarray; box_test != box; box_test++) {
if BOXINTERSECT(box, box_test) {
diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c
index f903072afb9..64b31df9c8e 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -850,7 +850,7 @@ int isect_line_plane_v3(float out[3], const float l1[3], const float l2[3], cons
float l1_plane[3]; /* line point aligned with the plane */
float dist; /* 'plane_no' aligned distance to the 'plane_co' */
- /* for pradictable flipping since the plane is only used to
+ /* for predictable flipping since the plane is only used to
* define a direction, ignore its flipping and aligned with 'l_vec' */
if(dot < 0.0f) {
dot= -dot;
diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
index 18f7767c303..084af4be573 100644
--- a/source/blender/blenlib/intern/path_util.c
+++ b/source/blender/blenlib/intern/path_util.c
@@ -378,8 +378,8 @@ void BLI_cleanup_path(const char *relabase, char *dir)
}
/* support for odd paths: eg /../home/me --> /home/me
- * this is a valid path in blender but we cant handle this the useual way below
- * simply strip this prefix then evaluate the path as useual. pythons os.path.normpath() does this */
+ * this is a valid path in blender but we cant handle this the usual way below
+ * simply strip this prefix then evaluate the path as usual. pythons os.path.normpath() does this */
while((strncmp(dir, "/../", 4)==0)) {
memmove( dir, dir + 4, strlen(dir + 4) + 1 );
}
@@ -1571,7 +1571,7 @@ char *BLI_path_basename(char *path)
This logic will help ensure that all image paths are relative and
that a user gets his images in one place. It'll also provide
- consistent behaviour across exporters.
+ consistent behavior across exporters.
*/
int BKE_rebase_path(char *abs, size_t abs_len, char *rel, size_t rel_len, const char *base_dir, const char *src_dir, const char *dest_dir)
{
diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c
index 3a66425a5de..e2c86d70872 100644
--- a/source/blender/blenlib/intern/string.c
+++ b/source/blender/blenlib/intern/string.c
@@ -184,8 +184,8 @@ char *BLI_getQuotedStr (const char *str, const char *prefix)
return BLI_strdupn(startMatch, (size_t)(endMatch-startMatch));
}
-/* Replaces all occurances of oldText with newText in str, returning a new string that doesn't
- * contain the 'replaced' occurances.
+/* Replaces all occurrences of oldText with newText in str, returning a new string that doesn't
+ * contain the 'replaced' occurrences.
*/
// A rather wasteful string-replacement utility, though this shall do for now...
// Feel free to replace this with an even safe + nicer alternative
@@ -231,7 +231,7 @@ char *BLI_replacestr(char *str, const char *oldText, const char *newText)
str += lenOld;
}
- /* finish off and return a new string that has had all occurances of */
+ /* finish off and return a new string that has had all occurrences of */
if (ds) {
char *newStr;
diff --git a/source/blender/blenlib/intern/voxel.c b/source/blender/blenlib/intern/voxel.c
index f6c8c634c8d..dd56988fd90 100644
--- a/source/blender/blenlib/intern/voxel.c
+++ b/source/blender/blenlib/intern/voxel.c
@@ -43,7 +43,7 @@ BM_INLINE float D(float *data, const int res[3], int x, int y, int z)
return data[ V_I(x, y, z, res) ];
}
-/* *** nearest neighbour *** */
+/* *** nearest neighbor *** */
/* input coordinates must be in bounding box 0.0 - 1.0 */
float voxel_sample_nearest(float *data, const int res[3], const float co[3])
{