From 9a6576181471d29dc1be78fdccbb3ee8de88e81b Mon Sep 17 00:00:00 2001 From: John Date: Fri, 22 Dec 2017 14:16:39 +0800 Subject: [PATCH] [unity] Fix auto-assigning BoneFollower bone. --- .../Editor/BoundingBoxFollowerInspector.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spine-unity/Assets/spine-unity/Modules/BoundingBoxFollower/Editor/BoundingBoxFollowerInspector.cs b/spine-unity/Assets/spine-unity/Modules/BoundingBoxFollower/Editor/BoundingBoxFollowerInspector.cs index 8d340d2f3..f1ecd2ea1 100644 --- a/spine-unity/Assets/spine-unity/Modules/BoundingBoxFollower/Editor/BoundingBoxFollowerInspector.cs +++ b/spine-unity/Assets/spine-unity/Modules/BoundingBoxFollower/Editor/BoundingBoxFollowerInspector.cs @@ -75,13 +75,13 @@ namespace Spine.Unity.Editor { serializedObject.ApplyModifiedProperties(); } - var sr = skeletonRenderer.objectReferenceValue as SkeletonRenderer; - if (sr != null && sr.gameObject == follower.gameObject) { + var skeletonRendererValue = skeletonRenderer.objectReferenceValue as SkeletonRenderer; + if (skeletonRendererValue != null && skeletonRendererValue.gameObject == follower.gameObject) { using (new EditorGUILayout.VerticalScope(EditorStyles.helpBox)) { EditorGUILayout.HelpBox("It's ideal to add BoundingBoxFollower to a separate child GameObject of the Spine GameObject.", MessageType.Warning); if (GUILayout.Button(new GUIContent("Move BoundingBoxFollower to new GameObject", Icons.boundingBox), GUILayout.Height(50f))) { - AddBoundingBoxFollowerChild(sr, follower); + AddBoundingBoxFollowerChild(skeletonRendererValue, follower); DestroyImmediate(follower); return; } @@ -156,6 +156,7 @@ namespace Spine.Unity.Editor { if (Event.current.type == EventType.Repaint) { if (addBoneFollower) { var boneFollower = follower.gameObject.AddComponent(); + boneFollower.skeletonRenderer = skeletonRendererValue; boneFollower.SetBone(follower.Slot.Data.BoneData.Name); addBoneFollower = false; }