[Bf-blender-cvs] [61ff3df] master: Code Cleanup: spelling
Campbell Barton
noreply at git.blender.org
Mon Jan 13 05:32:15 CET 2014
Commit: 61ff3dfdda3aa80323fb2c0324e1813a7b136a88
Author: Campbell Barton
Date: Mon Jan 13 14:53:41 2014 +1100
https://developer.blender.org/rB61ff3dfdda3aa80323fb2c0324e1813a7b136a88
Code Cleanup: spelling
===================================================================
M release/scripts/modules/bpy_extras/mesh_utils.py
M release/scripts/startup/bl_ui/properties_object.py
M source/blender/blenlib/intern/polyfill2d.c
M source/blender/bmesh/intern/bmesh_polygon.c
M source/blender/bmesh/tools/bmesh_beautify.c
M source/blender/python/mathutils/mathutils_geometry.c
M source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
diff --git a/release/scripts/modules/bpy_extras/mesh_utils.py b/release/scripts/modules/bpy_extras/mesh_utils.py
index a92d222..1e3e4c8 100644
--- a/release/scripts/modules/bpy_extras/mesh_utils.py
+++ b/release/scripts/modules/bpy_extras/mesh_utils.py
@@ -324,7 +324,7 @@ def edge_loops_from_edges(mesh, edges=None):
def ngon_tessellate(from_data, indices, fix_loops=True):
"""
Takes a polyline of indices (fgon) and returns a list of face
- indicie lists. Designed to be used for importers that need indices for an
+ index lists. Designed to be used for importers that need indices for an
fgon to create from existing verts.
:arg from_data: either a mesh, or a list/tuple of vectors.
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index da74031..8d7f5cf 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -172,7 +172,7 @@ class OBJECT_PT_groups(ObjectButtonsPanel, Panel):
obj_name = obj.name
for group in bpy.data.groups:
# XXX this is slow and stupid!, we need 2 checks, one thats fast
- # and another that we can be sure its not a name collission
+ # and another that we can be sure its not a name collision
# from linked library data
group_objects = group.objects
if obj_name in group.objects and obj in group_objects[:]:
diff --git a/source/blender/blenlib/intern/polyfill2d.c b/source/blender/blenlib/intern/polyfill2d.c
index f5a226c..9168d2f 100644
--- a/source/blender/blenlib/intern/polyfill2d.c
+++ b/source/blender/blenlib/intern/polyfill2d.c
@@ -433,7 +433,7 @@ void BLI_polyfill_calc_arena(
struct MemArena *arena)
{
- unsigned int *indicies = BLI_memarena_alloc(arena, sizeof(*indicies) * coords_tot);
+ unsigned int *indices = BLI_memarena_alloc(arena, sizeof(*indices) * coords_tot);
eSign *coords_sign = BLI_memarena_alloc(arena, sizeof(*coords_sign) * coords_tot);
BLI_polyfill_calc_ex(
@@ -441,9 +441,9 @@ void BLI_polyfill_calc_arena(
r_tris,
/* cache */
- indicies, coords_sign);
+ indices, coords_sign);
- /* indicies & coords_sign are no longer needed,
+ /* indices & coords_sign are no longer needed,
* caller can clear arena */
}
@@ -452,7 +452,7 @@ void BLI_polyfill_calc(
const unsigned int coords_tot,
unsigned int (*r_tris)[3])
{
- unsigned int *indicies = BLI_array_alloca(indicies, coords_tot);
+ unsigned int *indices = BLI_array_alloca(indices, coords_tot);
eSign *coords_sign = BLI_array_alloca(coords_sign, coords_tot);
BLI_polyfill_calc_ex(
@@ -460,5 +460,5 @@ void BLI_polyfill_calc(
r_tris,
/* cache */
- indicies, coords_sign);
+ indices, coords_sign);
}
diff --git a/source/blender/bmesh/intern/bmesh_polygon.c b/source/blender/bmesh/intern/bmesh_polygon.c
index a3aaea9..797c21d 100644
--- a/source/blender/bmesh/intern/bmesh_polygon.c
+++ b/source/blender/bmesh/intern/bmesh_polygon.c
@@ -174,7 +174,7 @@ static void bm_face_calc_poly_center_mean_vertex_cos(BMFace *f, float r_cent[3],
* For tools that insist on using triangles, ideally we would cache this data.
*
* \param r_loops Store face loop pointers, (f->len)
- * \param r_index Store triangle triples, indicies into \a r_loops, ((f->len - 2) * 3)
+ * \param r_index Store triangle triples, indices into \a r_loops, ((f->len - 2) * 3)
*/
void BM_face_calc_tessellation(const BMFace *f, BMLoop **r_loops, unsigned int (*r_index)[3])
{
diff --git a/source/blender/bmesh/tools/bmesh_beautify.c b/source/blender/bmesh/tools/bmesh_beautify.c
index 26d02cf..45093f9 100644
--- a/source/blender/bmesh/tools/bmesh_beautify.c
+++ b/source/blender/bmesh/tools/bmesh_beautify.c
@@ -377,7 +377,7 @@ static void bm_edge_update_beauty_cost(BMEdge *e, Heap *eheap, HeapNode **eheap_
/* Beautify Fill */
/**
- * \note This function sets the edge indicies to invalid values.
+ * \note This function sets the edge indices to invalid values.
*/
void BM_mesh_beautify_fill(BMesh *bm, BMEdge **edge_array, const int edge_array_len,
const short flag, const short method,
diff --git a/source/blender/python/mathutils/mathutils_geometry.c b/source/blender/python/mathutils/mathutils_geometry.c
index 10f4e57..16f51bd 100644
--- a/source/blender/python/mathutils/mathutils_geometry.c
+++ b/source/blender/python/mathutils/mathutils_geometry.c
@@ -1103,7 +1103,7 @@ PyDoc_STRVAR(M_Geometry_points_in_planes_doc,
"\n"
" :arg planes: List of planes (4D vectors).\n"
" :type planes: list of :class:`mathutils.Vector`\n"
-" :return: two lists, once containing the vertices inside the planes, another containing the plane indicies used\n"
+" :return: two lists, once containing the vertices inside the planes, another containing the plane indices used\n"
" :rtype: pair of lists\n"
);
/* note: this function could be optimized by some spatial structure */
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 08e2409..68fe735 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -530,7 +530,7 @@ static PyObject *gPyGetBlendFileList(PyObject *, PyObject *args)
if ((dp = opendir(cpath)) == NULL) {
/* todo, show the errno, this shouldnt happen anyway if the blendfile is readable */
- fprintf(stderr, "Could not read directoty (%s) failed, code %d (%s)\n", cpath, errno, strerror(errno));
+ fprintf(stderr, "Could not read directory (%s) failed, code %d (%s)\n", cpath, errno, strerror(errno));
return list;
}
More information about the Bf-blender-cvs
mailing list