From 7f4bb1f71bfef6914fe610266e97b20346c8f05c Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 15 Oct 2011 14:14:22 +0000
Subject: spelling corrections in comments and quiet warning

---
 source/blender/blenfont/intern/blf_font.c               | 2 +-
 source/blender/blenkernel/intern/constraint.c           | 6 +++---
 source/blender/editors/animation/anim_filter.c          | 3 ++-
 source/blender/editors/gpencil/editaction_gpencil.c     | 2 +-
 source/blender/editors/interface/interface.c            | 8 ++++----
 source/blender/editors/interface/interface_regions.c    | 2 +-
 source/blender/editors/sculpt_paint/paint_image.c       | 2 +-
 source/blender/editors/sculpt_paint/paint_vertex.c      | 2 +-
 source/blender/editors/space_graph/graph_draw.c         | 2 +-
 source/blender/editors/space_sequencer/sequencer_edit.c | 2 +-
 source/blender/editors/space_view3d/drawobject.c        | 2 +-
 source/blender/editors/transform/transform.c            | 2 +-
 source/blender/makesdna/DNA_action_types.h              | 4 ++--
 source/blender/makesdna/DNA_constraint_types.h          | 2 +-
 source/blender/makesdna/DNA_ipo_types.h                 | 2 +-
 source/blender/makesrna/intern/rna_object_force.c       | 2 +-
 source/blender/python/intern/bpy_library.c              | 2 +-
 17 files changed, 24 insertions(+), 23 deletions(-)

(limited to 'source')

diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index 851c6542de0..5161761cf09 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -217,7 +217,7 @@ void blf_font_buffer(FontBLF *font, const char *str)
 	unsigned int i= 0;
 	GlyphBLF **glyph_ascii_table= font->glyph_cache->glyph_ascii_table;
 
-	/* buffer spesific vars*/
+	/* buffer specific vars*/
 	const unsigned char b_col_char[4]= {font->b_col[0] * 255,
 	                                    font->b_col[1] * 255,
 	                                    font->b_col[2] * 255,
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 591e0b6a8d2..08a3eab55e6 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -1067,7 +1067,7 @@ static void trackto_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *ta
 		cob->matrix[2][2]=size[2];
 		
 		/* targetmat[2] instead of ownermat[2] is passed to vectomat
-		 * for backwards compatability it seems... (Aligorith)
+		 * for backwards compatibility it seems... (Aligorith)
 		 */
 		sub_v3_v3v3(vec, cob->matrix[3], ct->matrix[3]);
 		vectomat(vec, ct->matrix[2], 
@@ -2104,7 +2104,7 @@ static void actcon_new_data (void *cdata)
 {
 	bActionConstraint *data= (bActionConstraint *)cdata;
 	
-	/* set type to 20 (Loc X), as 0 is Rot X for backwards compatability */
+	/* set type to 20 (Loc X), as 0 is Rot X for backwards compatibility */
 	data->type = 20;
 }
 
@@ -2161,7 +2161,7 @@ static void actcon_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstraint
 		constraint_target_to_mat4(ct->tar, ct->subtarget, tempmat, CONSTRAINT_SPACE_WORLD, ct->space, con->headtail);
 		
 		/* determine where in transform range target is */
-		/* data->type is mapped as follows for backwards compatability:
+		/* data->type is mapped as follows for backwards compatibility:
 		 *	00,01,02	- rotation (it used to be like this)
 		 * 	10,11,12	- scaling
 		 *	20,21,22	- location
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index c982a1d7f86..fe6aed77462 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -361,7 +361,8 @@ short ANIM_animdata_get_context (const bContext *C, bAnimContext *ac)
 			_doSubChannels=2; \
 		else {\
 			filter_mode |= ANIMFILTER_TMP_PEEK; \
-		}
+		} \
+		(void) _doSubChannels;
 		/* ... standard sub-channel filtering can go on here now ... */
 #define END_ANIMFILTER_SUBCHANNELS \
 		filter_mode = _filter; \
diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c
index 937d24eed04..b6398c6a2f5 100644
--- a/source/blender/editors/gpencil/editaction_gpencil.c
+++ b/source/blender/editors/gpencil/editaction_gpencil.c
@@ -259,7 +259,7 @@ void duplicate_gplayer_frames (bGPDlayer *gpl)
 /* Copy and Paste Tools */
 /* - The copy/paste buffer currently stores a set of GP_Layers, with temporary
  *	GP_Frames with the necessary strokes
- * - Unless there is only one element in the buffer, names are also tested to check for compatability.
+ * - Unless there is only one element in the buffer, names are also tested to check for compatibility.
  * - All pasted frames are offset by the same amount. This is calculated as the difference in the times of
  *	the current frame and the 'first keyframe' (i.e. the earliest one in all channels).
  * - The earliest frame is calculated per copy operation.
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 299bec0db8a..b6c72c2e96f 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -575,7 +575,7 @@ static void ui_draw_links(uiBlock *block)
 /* NOTE: if but->poin is allocated memory for every defbut, things fail... */
 static int ui_but_equals_old(uiBut *but, uiBut *oldbut)
 {
-	/* various properties are being compared here, hopfully sufficient
+	/* various properties are being compared here, hopefully sufficient
 	 * to catch all cases, but it is simple to add more checks later */
 	if(but->retval != oldbut->retval) return 0;
 	if(but->rnapoin.data != oldbut->rnapoin.data) return 0;
@@ -640,7 +640,7 @@ static int ui_but_update_from_old_block(const bContext *C, uiBlock *block, uiBut
 //				but->flag= oldbut->flag;
 #else
 				/* exception! redalert flag can't be update from old button. 
-				 * perhaps it should only copy spesific flags rather than all. */
+				 * perhaps it should only copy specific flags rather than all. */
 //				but->flag= (oldbut->flag & ~UI_BUT_REDALERT) | (but->flag & UI_BUT_REDALERT);
 #endif
 //				but->active= oldbut->active;
@@ -748,7 +748,7 @@ static int ui_but_is_rna_undo(uiBut *but)
 	if(but->rnapoin.id.data) {
 		/* avoid undo push for buttons who's ID are screen or wm level
 		 * we could disable undo for buttons with no ID too but may have
-		 * unforseen conciquences, so best check for ID's we _know_ are not
+		 * unforeseen consequences, so best check for ID's we _know_ are not
 		 * handled by undo - campbell */
 		ID *id= but->rnapoin.id.data;
 		if(ID_CHECK_UNDO(id) == FALSE) {
@@ -865,7 +865,7 @@ void uiEndBlock(const bContext *C, uiBlock *block)
 
 	/* inherit flags from 'old' buttons that was drawn here previous, based
 	 * on matching buttons, we need this to make button event handling non
-	 * blocking, while still alowing buttons to be remade each redraw as it
+	 * blocking, while still allowing buttons to be remade each redraw as it
 	 * is expected by blender code */
 	for(but=block->buttons.first; but; but=but->next) {
 		if(ui_but_update_from_old_block(C, block, &but))
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 622d50752fa..028ab05464b 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -368,7 +368,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
 	/* create tooltip data */
 	data= MEM_callocN(sizeof(uiTooltipData), "uiTooltipData");
 
-	/* special case, enum rna buttons only have enum item description, use general enum description too before the spesific one */
+	/* special case, enum rna buttons only have enum item description, use general enum description too before the specific one */
 	if(but->rnaprop && RNA_property_type(but->rnaprop) == PROP_ENUM) {
 		const char *descr= RNA_property_description(but->rnaprop);
 		if(descr && descr[0]) {
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 1c53be15a0f..9842bc0e1ee 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -3966,7 +3966,7 @@ static int project_paint_op(void *state, ImBuf *UNUSED(ibufb), float *lastpos, f
 		copy_v2_v2(handles[a].mval, pos);
 		copy_v2_v2(handles[a].prevmval, lastpos);
 		
-		/* thread spesific */
+		/* thread specific */
 		handles[a].thread_index = a;
 		
 		handles[a].projImages = (ProjPaintImage *)BLI_memarena_alloc(ps->arena_mt[a], ps->image_tot * sizeof(ProjPaintImage));
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index cf90c43f3e1..87411b97061 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -1619,7 +1619,7 @@ static void do_weight_paint_vertex( /* vars which remain the same for every vert
 			}
 		}
 
-		/* important to normalize after mirror, otherwise mirror gets wight
+		/* important to normalize after mirror, otherwise mirror gets weight
 		 * which has already been scaled down in relation to other weights,
 		 * then scales a second time [#26193]. Tricky multi-paint code doesn't
 		 * suffer from this problem - campbell */
diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c
index dc5e71f0406..37e6c0b73c9 100644
--- a/source/blender/editors/space_graph/graph_draw.c
+++ b/source/blender/editors/space_graph/graph_draw.c
@@ -340,7 +340,7 @@ static void draw_fcurve_handles (SpaceIpo *sipo, FCurve *fcu)
 	int sel, b;
 	
 	/* a single call to GL_LINES here around these calls should be sufficient to still
-	 * get separate line segments, but which aren't wrapped with GL_LINE_STRIP everytime we
+	 * get separate line segments, but which aren't wrapped with GL_LINE_STRIP every time we
 	 * want a single line
 	 */
 	glBegin(GL_LINES);
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index da785430d43..45543a9313e 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -2977,7 +2977,7 @@ static int sequencer_change_path_exec(bContext *C, wmOperator *op)
 
 		RNA_string_get(op->ptr, "directory", directory);
 		if (is_relative_path) {
-			/* TODO, shouldnt this already be relative from the filesel?
+			/* TODO, shouldn't this already be relative from the filesel?
 			 * (as the 'filepath' is) for now just make relative here,
 			 * but look into changing after 2.60 - campbell */
 			BLI_path_rel(directory, bmain->name);
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index eb2e821e398..04531bf5ab2 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -765,7 +765,7 @@ void view3d_cached_text_draw_end(View3D *v3d, ARegion *ar, int depth_write, floa
 		else glDepthMask(0);
 		
 		for(vos= strings->first; vos; vos= vos->next) {
-#if 0       // too slow, reading opengl info while drawing is very bad, better to see if we cn use the zbuffer while in pixel space - campbell
+#if 0       // too slow, reading opengl info while drawing is very bad, better to see if we can use the zbuffer while in pixel space - campbell
 			if(v3d->zbuf && (vos->flag & V3D_CACHE_TEXT_ZBUF)) {
 				gluProject(vos->vec[0], vos->vec[1], vos->vec[2], mats.modelview, mats.projection, (GLint *)mats.viewport, &ux, &uy, &uz);
 				glReadPixels(ar->winrct.xmin+vos->mval[0]+vos->xoffs, ar->winrct.ymin+vos->mval[1], 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depth);
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 73acd1f9000..859c7778883 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1922,7 +1922,7 @@ static void protectedQuaternionBits(short protectflag, float *quat, float *oldqu
 			quat[3]= oldquat[3];
 	}
 	else {
-		/* quaternions get limited with euler... (compatability mode) */
+		/* quaternions get limited with euler... (compatibility mode) */
 		float eul[3], oldeul[3], nquat[4], noldquat[4];
 		float qlen;
 
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 29e0b18b97d..db574160771 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -340,7 +340,7 @@ typedef struct bPose {
 	void *ikdata;				/* temporary IK data, depends on the IK solver. Not saved in file */
 	void *ikparam;				/* IK solver parameters, structure depends on iksolver */ 
 	
-	bAnimVizSettings avs;		/* settings for visualisation of bone animation */
+	bAnimVizSettings avs;		/* settings for visualization of bone animation */
 	char proxy_act_bone[32];    /* proxy active bone name*/
 } bPose;
 
@@ -653,7 +653,7 @@ typedef enum eAnimEdit_AutoSnap {
  * Constraint Channels in certain situations. 
  *
  * Action-Channels can only belong to one group at a time, but they still live the Action's
- * list of achans (to preserve backwards compatability, and also minimise the code
+ * list of achans (to preserve backwards compatibility, and also minimize the code
  * that would need to be recoded). Grouped achans are stored at the start of the list, according
  * to the position of the group in the list, and their position within the group. 
  */
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index e04bdd4ec45..00f6f2433af 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -228,7 +228,7 @@ typedef struct bMinMaxConstraint {
 	int			minmaxflag;
 	float		offset;
 	int			flag;
-	short		sticky, stuck, pad1, pad2; /* for backward compatability */
+	short		sticky, stuck, pad1, pad2; /* for backward compatibility */
 	float		cache[3];
 	char		subtarget[32];
 } bMinMaxConstraint;
diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h
index 8fe8b3bcf70..201ea8994ca 100644
--- a/source/blender/makesdna/DNA_ipo_types.h
+++ b/source/blender/makesdna/DNA_ipo_types.h
@@ -30,7 +30,7 @@
  *  \deprecated
  *   The contents of this file are now officially depreceated. They were used for the 'old' animation system,
  *   which has (as of 2.50) been replaced with a completely new system by Joshua Leung (aligorith). All defines, 
- *   etc. are only still maintained to provide backwards compatability for old files.
+ *   etc. are only still maintained to provide backwards compatibility for old files.
  */
  
 #ifndef DNA_IPO_TYPES_H
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index a6e0e9f3331..c36dca22731 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -53,7 +53,7 @@ static EnumPropertyItem effector_shape_items[] = {
 
 #ifdef RNA_RUNTIME
 
-/* type spesific return values only used from functions */
+/* type specific return values only used from functions */
 static EnumPropertyItem curve_shape_items[] = {
 	{PFIELD_SHAPE_POINT, "POINT", 0, "Point", ""},
 	{PFIELD_SHAPE_PLANE, "PLANE", 0, "Plane", ""},
diff --git a/source/blender/python/intern/bpy_library.c b/source/blender/python/intern/bpy_library.c
index 603bb0ed0ac..3b0c6a9ff25 100644
--- a/source/blender/python/intern/bpy_library.c
+++ b/source/blender/python/intern/bpy_library.c
@@ -58,7 +58,7 @@
 
 typedef struct {
 	PyObject_HEAD /* required python macro   */
-	/* collection iterator spesific parts */
+	/* collection iterator specific parts */
 	char relpath[FILE_MAX];
 	char abspath[FILE_MAX]; /* absolute path */
 	BlendHandle *blo_handle;
-- 
cgit v1.2.3