Merge branch '3.6' into 3.7-beta

EsotericSoftware · Dec 15, 2017 · ee7d9d2 · ee7d9d2
2 parents 7dcc1d0 + ab4fcb4
commit ee7d9d2
Show file tree

Hide file tree

Showing 13 changed files with 400 additions and 384 deletions.
diff --git a/spine-unity/Assets/spine-unity/Asset Types/Editor.meta b/spine-unity/Assets/spine-unity/Asset Types/Editor.meta
diff --git a/spine-unity/Assets/spine-unity/BoneFollower.cs b/spine-unity/Assets/spine-unity/BoneFollower.cs
@@ -73,7 +73,7 @@ public SkeletonRenderer SkeletonRenderer {
 		bool skeletonTransformIsParent;
 
 		/// <summary>
-		/// Sets the target bone by its bone name. Returns false if no bone was found.</summary>
+		/// Sets the target bone by its bone name. Returns false if no bone was found. To set the bone by reference, use BoneFollower.bone directly.</summary>
 		public bool SetBone (string name) {
 			bone = skeletonRenderer.skeleton.FindBone(name);
 			if (bone == null) {