Merge branch 'master' into blender2.8

1 files changed, 10 insertions, 10 deletions

diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index fa5b59b739d..66106a97566 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -287,12 +287,12 @@ int bone_autoside_name(char name[MAXBONENAME], int UNUSED(strip_number), short a
 	BLI_strncpy(basename, name, sizeof(basename));
 
 	/* Figure out extension to append:
-	 *	- The extension to append is based upon the axis that we are working on.
-	 *	- If head happens to be on 0, then we must consider the tail position as well to decide
-	 *	  which side the bone is on
-	 *		-> If tail is 0, then it's bone is considered to be on axis, so no extension should be added
-	 *		-> Otherwise, extension is added from perspective of object based on which side tail goes to
-	 *	- If head is non-zero, extension is added from perspective of object based on side head is on
+	 * - The extension to append is based upon the axis that we are working on.
+	 * - If head happens to be on 0, then we must consider the tail position as well to decide
+	 *   which side the bone is on
+	 *   -> If tail is 0, then it's bone is considered to be on axis, so no extension should be added
+	 *   -> Otherwise, extension is added from perspective of object based on which side tail goes to
+	 * - If head is non-zero, extension is added from perspective of object based on side head is on
 	 */
 	if (axis == 2) {
 		/* z-axis - vertical (top/bottom) */
@@ -342,8 +342,8 @@ int bone_autoside_name(char name[MAXBONENAME], int UNUSED(strip_number), short a
 	}
 
 	/* Simple name truncation
-	 *	- truncate if there is an extension and it wouldn't be able to fit
-	 *	- otherwise, just append to end
+	 * - truncate if there is an extension and it wouldn't be able to fit
+	 * - otherwise, just append to end
 	 */
 	if (extension[0]) {
 		bool changed = true;
@@ -2333,8 +2333,8 @@ void BKE_pose_where_is(struct Depsgraph *depsgraph, Scene *scene, Object *ob)
 		BIK_initialize_tree(depsgraph, scene, ob, ctime);
 
 		/* 2b. construct the Spline IK trees
-		 *  - this is not integrated as an IK plugin, since it should be able
-		 *	  to function in conjunction with standard IK
+		 * - this is not integrated as an IK plugin, since it should be able
+		 *   to function in conjunction with standard IK
 		 */
 		BKE_pose_splineik_init_tree(scene, ob, ctime);