Merge branch 'master' into blender2.8

6 files changed, 13 insertions, 13 deletions

diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 1dd8442b0df..1495ca50870 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -1111,7 +1111,7 @@ static bool acf_nla_controls_setting_valid(bAnimContext *UNUSED(ac), bAnimListEl
 		case ACHANNEL_SETTING_EXPAND:
 			return true;
 
-		// TOOD: selected?
+		// TODO: selected?
 
 		default: /* unsupported */
 			return false;
@@ -3035,7 +3035,7 @@ static int acf_gpl_setting_flag(bAnimContext *UNUSED(ac), eAnimChannel_Settings
 		case ACHANNEL_SETTING_MUTE: /* animation muting - similar to frame lock... */
 			return GP_LAYER_FRAMELOCK;
 
-		case ACHANNEL_SETTING_VISIBLE: /* visiblity of the layers (NOT muting) */
+		case ACHANNEL_SETTING_VISIBLE: /* visibility of the layers (NOT muting) */
 			*neg = true;
 			return GP_LAYER_HIDE;
 
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c
index 389a8d0fd03..26ef7f5ee73 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -2819,7 +2819,7 @@ static int mouse_anim_channels(bContext *C, bAnimContext *ac, int channel_index,
 				agrp->flag ^= AGRP_SELECTED;
 			}
 			else if (selectmode == -1) {
-				/* select all in group (and deselect everthing else) */
+				/* select all in group (and deselect everything else) */
 				FCurve *fcu;
 
 				/* deselect all other channels */
diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index 54590c5f66c..556e88cdf8f 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -1529,7 +1529,7 @@ static size_t animfilter_nla_controls(ListBase *anim_data, bDopeSheet *ads, Anim
 		items += tmp_items;
 	}
 
-	/* return the numebr of items added to the list */
+	/* return the number of items added to the list */
 	return items;
 }
 
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index e0f9a546dfc..a1e7df39014 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -636,7 +636,7 @@ static int ed_markers_opwrap_invoke(bContext *C, wmOperator *op, const wmEvent *
 
 /* ************************** add markers *************************** */
 
-/* add TimeMarker at curent frame */
+/* add TimeMarker at current frame */
 static int ed_marker_add_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	ListBase *markers = ED_context_get_markers(C);
@@ -863,7 +863,7 @@ static int ed_marker_move_invoke_wrapper(bContext *C, wmOperator *op, const wmEv
 	return ed_markers_opwrap_invoke_custom(C, op, event, ed_marker_move_invoke);
 }
 
-/* note, init has to be called succesfully */
+/* note, init has to be called successfully */
 static void ed_marker_move_apply(bContext *C, wmOperator *op)
 {
 #ifdef DURIAN_CAMERA_SWITCH
diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c
index 1e5bc4f1cd0..541a282f389 100644
--- a/source/blender/editors/animation/keyframes_edit.c
+++ b/source/blender/editors/animation/keyframes_edit.c
@@ -107,7 +107,7 @@ short ANIM_fcurve_keyframes_loop(KeyframeEditData *ked, FCurve *fcu, KeyframeEdi
 					ked->curflags = 0;
 				}
 
-				/* Only operate on this BezTriple if it fullfills the criteria of the validation func */
+				/* Only operate on this BezTriple if it fulfills the criteria of the validation func */
 				if ((ok = key_ok(ked, bezt))) {
 					if (ked) ked->curflags = ok;
 
@@ -759,7 +759,7 @@ static short snap_bezier_nearest(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
 	return 0;
 }
 
-/* snaps the keyframe to the neares second */
+/* snaps the keyframe to the nearest second */
 static short snap_bezier_nearestsec(KeyframeEditData *ked, BezTriple *bezt)
 {
 	const Scene *scene = ked->scene;
@@ -880,7 +880,7 @@ static short mirror_bezier_cframe(KeyframeEditData *ked, BezTriple *bezt)
 static short mirror_bezier_yaxis(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
 {
 	if (bezt->f2 & SELECT) {
-		/* Yes, names are inverted, we are mirroring accross y axis, hence along x axis... */
+		/* Yes, names are inverted, we are mirroring across y axis, hence along x axis... */
 		mirror_bezier_xaxis_ex(bezt, 0.0f);
 	}
 
@@ -890,7 +890,7 @@ static short mirror_bezier_yaxis(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
 static short mirror_bezier_xaxis(KeyframeEditData *UNUSED(ked), BezTriple *bezt)
 {
 	if (bezt->f2 & SELECT) {
-		/* Yes, names are inverted, we are mirroring accross x axis, hence along y axis... */
+		/* Yes, names are inverted, we are mirroring across x axis, hence along y axis... */
 		mirror_bezier_yaxis_ex(bezt, 0.0f);
 	}
 
@@ -909,7 +909,7 @@ static short mirror_bezier_marker(KeyframeEditData *ked, BezTriple *bezt)
 
 static short mirror_bezier_time(KeyframeEditData *ked, BezTriple *bezt)
 {
-	/* value to mirror over is strored in f1 */
+	/* value to mirror over is stored in f1 */
 	if (bezt->f2 & SELECT) {
 		mirror_bezier_xaxis_ex(bezt, ked->f1);
 	}
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 7f045fa477f..bac4c4329cb 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -758,7 +758,7 @@ static bool visualkey_can_use(PointerRNA *ptr, PropertyRNA *prop)
 				case CONSTRAINT_TYPE_KINEMATIC:
 					return true;
 
-				/* single-transform constraits  */
+				/* single-transform constraints  */
 				case CONSTRAINT_TYPE_TRACKTO:
 					if (searchtype == VISUALKEY_ROT) return true;
 					break;
@@ -1710,7 +1710,7 @@ static int delete_key_v3d_exec(bContext *C, wmOperator *op)
 				}
 
 				/* special exception for bones, as this makes this operator more convenient to use
-				 * NOTE: This is only done in pose mode. In object mode, we're dealign with the entire object.
+				 * NOTE: This is only done in pose mode. In object mode, we're dealing with the entire object.
 				 */
 				if ((ob->mode & OB_MODE_POSE) && strstr(fcu->rna_path, "pose.bones[\"")) {
 					bPoseChannel *pchan;