style cleanup: also spelling

2012-08-24 23:22:34 +00:00
parent 3da7e0f3bf
commit ed0489bb6e
17 changed files with 56 additions and 57 deletions
--- a/extern/recastnavigation/Recast/Source/RecastFilter.cpp
+++ b/extern/recastnavigation/Recast/Source/RecastFilter.cpp
@@ -128,7 +128,7 @@ void rcFilterLedgeSpans(rcContext* ctx, const int walkableHeight, const int walk
 					rcSpan* ns = solid.spans[dx + dy*w];
 					int nbot = -walkableClimb;
 					int ntop = ns ? (int)ns->smin : MAX_HEIGHT;
-					// Skip neightbour if the gap between the spans is too small.
+					// Skip neighbor if the gap between the spans is too small.
 					if (rcMin(top,ntop) - rcMax(bot,nbot) > walkableHeight)
 						minh = rcMin(minh, nbot - bot);
 					
@@ -137,7 +137,7 @@ void rcFilterLedgeSpans(rcContext* ctx, const int walkableHeight, const int walk
 					{
 						nbot = (int)ns->smax;
 						ntop = ns->next ? (int)ns->next->smin : MAX_HEIGHT;
-						// Skip neightbour if the gap between the spans is too small.
+						// Skip neighbor if the gap between the spans is too small.
 						if (rcMin(top,ntop) - rcMax(bot,nbot) > walkableHeight)
 						{
 							minh = rcMin(minh, nbot - bot);
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -541,7 +541,7 @@ void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob)
 	CustomData_free(&me->pdata, me->totpoly);

 	/* ok, this should now use new CD shapekey data,
-	 * which shouuld be fed through the modifier
+	 * which should be fed through the modifier
 	 * stack*/
 	if (tmp.totvert != me->totvert && !did_shapekeys && me->key) {
 		printf("%s: YEEK! this should be recoded! Shape key loss!: ID '%s'\n", __func__, tmp.id.name);
@@ -1793,7 +1793,7 @@ static void mesh_calc_modifiers(Scene *scene, Object *ob, float (*inputVertexCos
 		{
 			finaldm->recalcTessellation(finaldm);
 		}
-		/* Even if tessellation is not needed, some modifiers migh have modified CD layers
+		/* Even if tessellation is not needed, some modifiers might have modified CD layers
 		 * (like mloopcol or mloopuv), hence we have to update those. */
 		else if (finaldm->dirty & DM_DIRTY_TESS_CDLAYERS) {
 			/* A tessellation already exists, it should always have a CD_POLYINDEX. */
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -282,7 +282,7 @@ void animviz_get_object_motionpaths(Object *ob, ListBase *targets)

 /* ........ */

-/* Note on evaluation optimisations:
+/* Note on evaluation optimizations:
 * Optimisations currently used here play tricks with the depsgraph in order to try and 
 * evaluate as few objects as strictly necessary to get nicer performance under standard
 * production conditions. For those people who really need the accurate version, 
@@ -323,7 +323,7 @@ static void motionpaths_calc_optimise_depsgraph(Scene *scene, ListBase *targets)
 /* update scene for current frame */
 static void motionpaths_calc_update_scene(Scene *scene)
 {
-#if 1 // 'production' optimisations always on
+#if 1 // 'production' optimizations always on
 	Base *base, *last = NULL;
 	
 	/* only stuff that moves or needs display still */
@@ -431,7 +431,7 @@ void animviz_calc_motionpaths(Scene *scene, ListBase *targets)
 	if (efra <= sfra) return;
 	
 	/* optimize the depsgraph for faster updates */
-	/* TODO: whether this is used should depend on some setting for the level of optimisations used */
+	/* TODO: whether this is used should depend on some setting for the level of optimizations used */
 	motionpaths_calc_optimise_depsgraph(scene, targets);
 	
 	/* calculate path over requested range */
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -1463,7 +1463,7 @@ void vec_roll_to_mat3(const float vec[3], const float roll, float mat[][3])
 	 *
 	 * was 0.0000000000001, caused bug [#31333], smaller values give unstable
 	 * roll when toggling editmode again...
-	 * No good value here, trying 0.000000001 as best compromize. :/
+	 * No good value here, trying 0.000000001 as best compromise. :/
 	 */
 	if (dot_v3v3(axis, axis) > 1.0e-9f) {
 		/* if nor is *not* a multiple of target ... */
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -1165,7 +1165,7 @@ void BKE_curve_forward_diff_bezier(float q0, float q1, float q2, float q3, float
 static void forward_diff_bezier_cotangent(const float p0[3], const float p1[3], const float p2[3], const float p3[3],
                                          float p[3], int it, int stride)
 {
-	/* note that these are not purpendicular to the curve
+	/* note that these are not perpendicular to the curve
 	 * they need to be rotated for this,
 	 *
 	 * This could also be optimized like BKE_curve_forward_diff_bezier */
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -3996,7 +3996,7 @@ void surface_determineForceTargetPoints(PaintSurfaceData *sData, int index, floa
 		float force_intersect;
 		float temp;

-		/* project force vector on the plane determined by these two neightbour points
+		/* project force vector on the plane determined by these two neighbor points
 		 *  and calculate relative force angle from it*/
 		cross_v3_v3v3(tangent, bNeighs[closest_id[0]].dir, bNeighs[closest_id[1]].dir);
 		normalize_v3(tangent);
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -365,7 +365,7 @@ int binarysearch_bezt_index(BezTriple array[], float frame, int arraylen, short
 	/* initialize replace-flag first */
 	*replace = 0;
 	
-	/* sneaky optimisations (don't go through searching process if...):
+	/* sneaky optimizations (don't go through searching process if...):
 	 *	- keyframe to be added is to be added out of current bounds
 	 *	- keyframe to be added would replace one of the existing ones on bounds
 	 */
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -813,7 +813,7 @@ void assign_material(Object *ob, Material *ma, short act, int assign_type)
 		*totcolp = act;
 	}

-	// Determine the object/mesh linking
+	/* Determine the object/mesh linking */
 	if (assign_type == BKE_MAT_ASSIGN_USERPREF && ob->totcol && ob->actcol) {
 		/* copy from previous material */
 		bit = ob->matbits[ob->actcol - 1];
@@ -1633,7 +1633,7 @@ static void decode_tfaceflag(Material *ma, int flag, int convertall)
 	/* flag is shifted in 1 to make 0 != no flag yet (see encode_tfaceflag) */
 	flag -= 1;

-	alphablend = flag >> 15; //encoded in the encode_tfaceflag function
+	alphablend = flag >> 15;  /* encoded in the encode_tfaceflag function */
 	(*game).flag = 0;
 	
 	/* General Material Options */
@@ -2033,8 +2033,7 @@ int do_version_tface(Main *main, int fileload)
 				nowarning = 0;
 			}
 			else
-				convert_tfacematerial(main, ma);
-			continue;	
+				convert_tfacematerial(main, ma);			continue;	
 		}
 	
 		/* no conflicts in this material - 90% of cases
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -764,7 +764,7 @@ void BKE_nlastrips_clear_metas(ListBase *strips, short onlySel, short onlyTemp)
 }

 /* Add the given NLA-Strip to the given Meta-Strip, assuming that the
- * strip isn't attached to anyy list of strips 
+ * strip isn't attached to any list of strips
 */
 short BKE_nlameta_add_strip(NlaStrip *mstrip, NlaStrip *strip)
 {
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -1484,7 +1484,7 @@ void nodeSocketSetType(bNodeSocket *sock, int type)
 * otherwise we may reference missing data.
 *
 * Currently its only used for ID's, but nodes may one day
- * referene other pointers which need validation.
+ * reference other pointers which need validation.
 */
 typedef struct bNodeClipboardExtraInfo {
 	struct bNodeClipboardExtraInfo *next, *prev;
--- a/source/blender/bmesh/intern/bmesh_opdefines.c
+++ b/source/blender/bmesh/intern/bmesh_opdefines.c
@@ -366,8 +366,8 @@ static BMOpDefine bmo_weld_verts_def = {
 */
 static BMOpDefine bmo_create_vert_def = {
 	"create_vert",
-	{{BMO_OP_SLOT_VEC, "co"}, //the coordinate of the new vert
-	 {BMO_OP_SLOT_ELEMENT_BUF, "newvertout"}, //the new vert
+	{{BMO_OP_SLOT_VEC, "co"},  /* the coordinate of the new vert */
+	 {BMO_OP_SLOT_ELEMENT_BUF, "newvertout"},  /* the new vert */
 	 {0, /* null-terminating sentinel */}},
 	bmo_create_vert_exec,
 	0,
@@ -381,8 +381,8 @@ static BMOpDefine bmo_create_vert_def = {
 */
 static BMOpDefine bmo_join_triangles_def = {
 	"join_triangles",
-	{{BMO_OP_SLOT_ELEMENT_BUF, "faces"}, //input geometry.
-	 {BMO_OP_SLOT_ELEMENT_BUF, "faceout"}, //joined faces
+	{{BMO_OP_SLOT_ELEMENT_BUF, "faces"},    /* input geometry. */
+	 {BMO_OP_SLOT_ELEMENT_BUF, "faceout"},  /* joined faces */
 	 {BMO_OP_SLOT_BOOL, "cmp_sharp"},
 	 {BMO_OP_SLOT_BOOL, "cmp_uvs"},
 	 {BMO_OP_SLOT_BOOL, "cmp_vcols"},
@@ -406,7 +406,7 @@ static BMOpDefine bmo_join_triangles_def = {
 */
 static BMOpDefine bmo_contextual_create_def = {
 	"contextual_create",
-	{{BMO_OP_SLOT_ELEMENT_BUF, "geom"}, //input geometry.
+	{{BMO_OP_SLOT_ELEMENT_BUF, "geom"}, /* input geometry. */
 	 {BMO_OP_SLOT_ELEMENT_BUF, "faceout"},     /* newly-made face(s) */
 	/* note, this is for stand-alone edges only, not edges which are apart of newly created faces */
 	 {BMO_OP_SLOT_ELEMENT_BUF, "edgeout"},     /* newly-made edge(s) */
@@ -459,8 +459,8 @@ static BMOpDefine bmo_edgenet_fill_def = {
 */
 static BMOpDefine bmo_edgenet_prepare_def = {
 	"edgenet_prepare",
-	{{BMO_OP_SLOT_ELEMENT_BUF, "edges"}, //input edges
-	 {BMO_OP_SLOT_ELEMENT_BUF, "edgeout"}, //new edges
+	{{BMO_OP_SLOT_ELEMENT_BUF, "edges"},    /* input edges */
+	 {BMO_OP_SLOT_ELEMENT_BUF, "edgeout"},  /* new edges */
 	 {0, /* null-terminating sentinel */}},
 	bmo_edgenet_prepare,
 	0,
@@ -474,9 +474,9 @@ static BMOpDefine bmo_edgenet_prepare_def = {
 */
 static BMOpDefine bmo_rotate_def = {
 	"rotate",
-	{{BMO_OP_SLOT_VEC, "cent"}, //center of rotation
-	 {BMO_OP_SLOT_MAT, "mat"}, //matrix defining rotation
-	 {BMO_OP_SLOT_ELEMENT_BUF, "verts"}, //input vertices
+	{{BMO_OP_SLOT_VEC, "cent"},  /* center of rotation */
+	 {BMO_OP_SLOT_MAT, "mat"},   /* matrix defining rotation */
+	 {BMO_OP_SLOT_ELEMENT_BUF, "verts"},  /* input vertices */
 	 {0, /* null-terminating sentinel */}},
 	bmo_rotate_exec,
 	0,
@@ -490,8 +490,8 @@ static BMOpDefine bmo_rotate_def = {
 */
 static BMOpDefine bmo_translate_def = {
 	"translate",
-	{{BMO_OP_SLOT_VEC, "vec"}, //translation offset
-	 {BMO_OP_SLOT_ELEMENT_BUF, "verts"}, //input vertices
+	{{BMO_OP_SLOT_VEC, "vec"},  /* translation offset */
+	 {BMO_OP_SLOT_ELEMENT_BUF, "verts"},  /* input vertices */
 	 {0, /* null-terminating sentinel */}},
 	bmo_translate_exec,
 	0,
@@ -504,8 +504,8 @@ static BMOpDefine bmo_translate_def = {
 */
 static BMOpDefine bmo_scale_def = {
 	"scale",
-	{{BMO_OP_SLOT_VEC, "vec"}, //scale factor
-	 {BMO_OP_SLOT_ELEMENT_BUF, "verts"}, //input vertices
+	{{BMO_OP_SLOT_VEC, "vec"},  /* scale factor */
+	 {BMO_OP_SLOT_ELEMENT_BUF, "verts"},  /* input vertices */
 	 {0, /* null-terminating sentinel */}},
 	bmo_scale_exec,
 	0,
@@ -520,8 +520,8 @@ static BMOpDefine bmo_scale_def = {
 */
 static BMOpDefine bmo_transform_def = {
 	"transform",
-	{{BMO_OP_SLOT_MAT, "mat"}, //transform matrix
-	 {BMO_OP_SLOT_ELEMENT_BUF, "verts"}, //input vertices
+	{{BMO_OP_SLOT_MAT, "mat"},  /* transform matrix */
+	 {BMO_OP_SLOT_ELEMENT_BUF, "verts"},  /* input vertices */
 	 {0, /* null-terminating sentinel */}},
 	bmo_transform_exec,
 	0,
@@ -550,9 +550,9 @@ static BMOpDefine bmo_object_load_bmesh_def = {
 */
 static BMOpDefine bmo_bmesh_to_mesh_def = {
 	"bmesh_to_mesh",
-	{{BMO_OP_SLOT_PTR, "mesh"}, //pointer to a mesh structure to fill in
-	 {BMO_OP_SLOT_PTR, "object"}, //pointer to an object structure
-	 {BMO_OP_SLOT_BOOL, "notessellation"}, //don't calculate mfaces
+	{{BMO_OP_SLOT_PTR, "mesh"},    /* pointer to a mesh structure to fill in */
+	 {BMO_OP_SLOT_PTR, "object"},  /* pointer to an object structure */
+	 {BMO_OP_SLOT_BOOL, "notessellation"},  /* don't calculate mfaces */
 	 {0, /* null-terminating sentinel */}},
 	bmo_bmesh_to_mesh_exec,
 	0,
@@ -566,9 +566,9 @@ static BMOpDefine bmo_bmesh_to_mesh_def = {
 */
 static BMOpDefine bmo_mesh_to_bmesh_def = {
 	"mesh_to_bmesh",
-	{{BMO_OP_SLOT_PTR, "mesh"}, //pointer to a Mesh structure
-	 {BMO_OP_SLOT_PTR, "object"}, //pointer to an Object structure
-	 {BMO_OP_SLOT_BOOL, "set_shapekey"}, //load active shapekey coordinates into verts
+	{{BMO_OP_SLOT_PTR, "mesh"},    /* pointer to a Mesh structure */
+	 {BMO_OP_SLOT_PTR, "object"},  /* pointer to an Object structure */
+	 {BMO_OP_SLOT_BOOL, "set_shapekey"},  /* load active shapekey coordinates into verts */
 	 {0, /* null-terminating sentinel */}},
 	bmo_mesh_to_bmesh_exec,
 	0
@@ -581,9 +581,9 @@ static BMOpDefine bmo_mesh_to_bmesh_def = {
 */
 static BMOpDefine bmo_extrude_discrete_faces_def = {
 	"extrude_discrete_faces",
-	{{BMO_OP_SLOT_ELEMENT_BUF, "faces"}, //input faces
-	 {BMO_OP_SLOT_ELEMENT_BUF, "faceout"}, //output faces
-	 {BMO_OP_SLOT_ELEMENT_BUF, "skirtout"}, //output skirt geometry, faces and edges
+	{{BMO_OP_SLOT_ELEMENT_BUF, "faces"},     /* input faces */
+	 {BMO_OP_SLOT_ELEMENT_BUF, "faceout"},   /* output faces */
+	 {BMO_OP_SLOT_ELEMENT_BUF, "skirtout"},  /* output skirt geometry, faces and edges */
 	 {0} /* null-terminating sentinel */},
 	bmo_extrude_discrete_faces_exec,
 	0
@@ -597,8 +597,8 @@ static BMOpDefine bmo_extrude_discrete_faces_def = {
 */
 static BMOpDefine bmo_extrude_edge_only_def = {
 	"extrude_edge_only",
-	{{BMO_OP_SLOT_ELEMENT_BUF, "edges"}, //input vertices
-	 {BMO_OP_SLOT_ELEMENT_BUF, "geomout"}, //output geometry
+	{{BMO_OP_SLOT_ELEMENT_BUF, "edges"},    /* input vertices */
+	 {BMO_OP_SLOT_ELEMENT_BUF, "geomout"},  /* output geometry */
 	 {0} /* null-terminating sentinel */},
 	bmo_extrude_edge_only_exec,
 	0
@@ -611,9 +611,9 @@ static BMOpDefine bmo_extrude_edge_only_def = {
 */
 static BMOpDefine bmo_extrude_vert_indiv_def = {
 	"extrude_vert_indiv",
-	{{BMO_OP_SLOT_ELEMENT_BUF, "verts"}, //input vertices
-	 {BMO_OP_SLOT_ELEMENT_BUF, "edgeout"}, //output wire edges
-	 {BMO_OP_SLOT_ELEMENT_BUF, "vertout"}, //output vertices
+	{{BMO_OP_SLOT_ELEMENT_BUF, "verts"},    /* input vertices */
+	 {BMO_OP_SLOT_ELEMENT_BUF, "edgeout"},  /* output wire edges */
+	 {BMO_OP_SLOT_ELEMENT_BUF, "vertout"},  /* output vertices */
 	 {0} /* null-terminating sentinel */},
 	bmo_extrude_vert_indiv_exec,
 	0
@@ -651,7 +651,7 @@ static BMOpDefine bmo_dissolve_edges_def = {
 	"dissolve_edges",
 	{{BMO_OP_SLOT_ELEMENT_BUF, "edges"},
 	 {BMO_OP_SLOT_ELEMENT_BUF, "regionout"},
-	 {BMO_OP_SLOT_BOOL, "use_verts"}, // dissolve verts left between only 2 edges.
+	 {BMO_OP_SLOT_BOOL, "use_verts"},  /* dissolve verts left between only 2 edges. */
 	 {0} /* null-terminating sentinel */},
 	bmo_dissolve_edges_exec,
 	BMO_OP_FLAG_UNTAN_MULTIRES
@@ -670,7 +670,7 @@ static BMOpDefine bmo_dissolve_faces_def = {
 	"dissolve_faces",
 	{{BMO_OP_SLOT_ELEMENT_BUF, "faces"},
 	 {BMO_OP_SLOT_ELEMENT_BUF, "regionout"},
-	 {BMO_OP_SLOT_BOOL, "use_verts"}, // dissolve verts left between only 2 edges.
+	 {BMO_OP_SLOT_BOOL, "use_verts"},  /* dissolve verts left between only 2 edges. */
 	 {0} /* null-terminating sentinel */},
 	bmo_dissolve_faces_exec,
 	BMO_OP_FLAG_UNTAN_MULTIRES
--- a/source/blender/editors/animation/fmodifier_ui.c
+++ b/source/blender/editors/animation/fmodifier_ui.c
@@ -336,7 +336,7 @@ static int binarysearch_fcm_envelopedata_index(FCM_EnvelopeData array[], float f
 	/* initialize exists-flag first */
 	*exists = 0;
 	
-	/* sneaky optimisations (don't go through searching process if...):
+	/* sneaky optimizations (don't go through searching process if...):
 	 *	- keyframe to be added is to be added out of current bounds
 	 *	- keyframe to be added would replace one of the existing ones on bounds
 	 */
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1480,7 +1480,7 @@ static void gpencil_draw_apply_event(wmOperator *op, wmEvent *event)
 	float mousef[2];
 	int tablet = 0;

-	/* convert from window-space to area-space mouse coordintes 
+	/* convert from window-space to area-space mouse coordinates
 	 * NOTE: float to ints conversions, +1 factor is probably used to ensure a bit more accurate rounding... 
 	 */
 	p->mval[0] = event->mval[0] + 1;
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -2969,7 +2969,7 @@ static int ui_do_but_BLOCK(bContext *C, uiBut *but, uiHandleButtonData *data, wm
 				 * Alt+MouseWheel over the render slots, without this,
 				 * the slot menu fails to switch a second time.
 				 *
-				 * Theactive state of the button could be maintained some other way
+				 * The active state of the button could be maintained some other way
 				 * and remove this mousemove event.
 				 */
 				WM_event_add_mousemove(C);
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -588,7 +588,7 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event)

 	/* store actual owner of job, so modal operator could check for it,
 	 * the reason of this is that active scene could change when rendering
-	 * several layers from composistor [#31800]
+	 * several layers from compositor [#31800]
 	 */
 	op->customdata = scene;

--- a/source/blender/editors/uvedit/uvedit_parametrizer.c
+++ b/source/blender/editors/uvedit/uvedit_parametrizer.c
@@ -45,7 +45,7 @@
 #include <stdio.h>
 #include <string.h>

-#include "BLO_sys_types.h" // for intptr_t support
+#include "BLO_sys_types.h"  /* for intptr_t support */

 /* Utils */

@@ -1040,7 +1040,7 @@ static PFace *p_face_add(PHandle *handle)

 	/* allocate */
 	f = (PFace *)BLI_memarena_alloc(handle->arena, sizeof *f);
-	f->flag = 0; // init !
+	f->flag = 0;  /* init ! */

 	e1 = (PEdge *)BLI_memarena_alloc(handle->arena, sizeof *e1);
 	e2 = (PEdge *)BLI_memarena_alloc(handle->arena, sizeof *e2);
@@ -1139,7 +1139,7 @@ static PBool p_quad_split_direction(PHandle *handle, float **co, PHashKey *vkeys
 	 * that in symmetric models we choose the same split direction instead of
 	 * depending on floating point errors to decide */
 	float bias = 1.0f + 1e-6f;
-	float fac = len_v3v3(co[0], co[2])*bias - len_v3v3(co[1], co[3]);
+	float fac = len_v3v3(co[0], co[2]) * bias - len_v3v3(co[1], co[3]);
 	PBool dir = (fac <= 0.0f);

 	/* the face exists check is there because of a special case: when
--- a/source/gameengine/SceneGraph/SG_ParentRelation.h
+++ b/source/gameengine/SceneGraph/SG_ParentRelation.h
@@ -82,7 +82,7 @@ public :
 	 * You must provide a way of duplicating an
 	 * instance of an SG_ParentRelation. This should
 	 * return a pointer to a new duplicate allocated
-	 * on the heap. Responsibilty for deleting the 
+	 * on the heap. Responsibility for deleting the
 	 * duplicate resides with the caller of this method.
 	 */