Merge branch 'master' into blender2.8

1 files changed, 9 insertions, 9 deletions

diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index 212bf0ba018..4aedd6a55d4 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -276,8 +276,8 @@ static void test_constraint(Main *bmain, Object *owner, bPoseChannel *pchan, bCo
 		bKinematicConstraint *data = con->data;
 
 		/* bad: we need a separate set of checks here as poletarget is
-		 *		optional... otherwise poletarget must exist too or else
-		 *		the constraint is deemed invalid
+		 * optional... otherwise poletarget must exist too or else
+		 * the constraint is deemed invalid
 		 */
 		/* default IK check ... */
 		if (BKE_object_exists_check(bmain, data->tar) == 0) {
@@ -1617,13 +1617,13 @@ static bool get_new_constraint_target(bContext *C, int con_type, Object **tar_ob
 	bool found = false;
 
 	/* clear tar_ob and tar_pchan fields before use
-	 *	- assume for now that both always exist...
+	 * - assume for now that both always exist...
 	 */
 	*tar_ob = NULL;
 	*tar_pchan = NULL;
 
 	/* check if constraint type doesn't requires a target
-	 *	- if so, no need to get any targets
+	 * - if so, no need to get any targets
 	 */
 	switch (con_type) {
 		/* no-target constraints --------------------------- */
@@ -1792,7 +1792,7 @@ static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase
 		con = BKE_constraint_add_for_object(ob, NULL, type);
 
 	/* get the first selected object/bone, and make that the target
-	 *	- apart from the buttons-window add buttons, we shouldn't add in this way
+	 * - apart from the buttons-window add buttons, we shouldn't add in this way
 	 */
 	if (setTarget) {
 		Object *tar_ob = NULL;
@@ -1801,7 +1801,7 @@ static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase
 		/* get the target objects, adding them as need be */
 		if (get_new_constraint_target(C, type, &tar_ob, &tar_pchan, 1)) {
 			/* method of setting target depends on the type of target we've got
-			 *	- by default, just set the first target (distinction here is only for multiple-targeted constraints)
+			 * - by default, just set the first target (distinction here is only for multiple-targeted constraints)
 			 */
 			if (tar_pchan)
 				set_constraint_nth_target(con, tar_ob, tar_pchan->name, 0);
@@ -1882,7 +1882,7 @@ static int object_constraint_add_exec(bContext *C, wmOperator *op)
 	}
 
 	/* hack: set constraint targets from selected objects in context is allowed when
-	 *		operator name included 'with_targets', since the menu doesn't allow multiple properties
+	 * operator name included 'with_targets', since the menu doesn't allow multiple properties
 	 */
 	if (strstr(op->idname, "with_targets"))
 		with_targets = 1;
@@ -1903,7 +1903,7 @@ static int pose_constraint_add_exec(bContext *C, wmOperator *op)
 	}
 
 	/* hack: set constraint targets from selected objects in context is allowed when
-	 *		operator name included 'with_targets', since the menu doesn't allow multiple properties
+	 * operator name included 'with_targets', since the menu doesn't allow multiple properties
 	 */
 	if (strstr(op->idname, "with_targets"))
 		with_targets = 1;
@@ -2027,7 +2027,7 @@ static int pose_ik_add_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED
 	/* the type of targets we'll set determines the menu entries to show... */
 	if (get_new_constraint_target(C, CONSTRAINT_TYPE_KINEMATIC, &tar_ob, &tar_pchan, 0)) {
 		/* bone target, or object target?
-		 *	- the only thing that matters is that we want a target...
+		 * - the only thing that matters is that we want a target...
 		 */
 		if (tar_pchan)
 			uiItemBooleanO(layout, IFACE_("To Active Bone"), ICON_NONE, "POSE_OT_ik_add", "with_targets", 1);