From 9d242ea90abca92fcb72b7facaff29306f9ef537 Mon Sep 17 00:00:00 2001
From: pharan <johndygit@live.com.ph>
Date: Thu, 6 Jul 2017 06:43:05 +0800
Subject: [PATCH] [unity] Cleanup BoundingBoxFollower support for active skin.

---
 .../Other Examples/Mix and Match.unity        | 62 +++++++++++++++++++
 .../Assets/Examples/Scripts/MixAndMatch.cs    |  2 +
 .../BoundingBoxFollower.cs                    |  3 +-
 3 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/spine-unity/Assets/Examples/Other Examples/Mix and Match.unity b/spine-unity/Assets/Examples/Other Examples/Mix and Match.unity
index 5f9aa6cc5..5d65e1420 100644
--- a/spine-unity/Assets/Examples/Other Examples/Mix and Match.unity	
+++ b/spine-unity/Assets/Examples/Other Examples/Mix and Match.unity	
@@ -1299,3 +1299,65 @@ SpriteRenderer:
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 1
+--- !u!1 &2010453060
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 2010453063}
+  - component: {fileID: 2010453062}
+  - component: {fileID: 2010453061}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &2010453061
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2010453060}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalAxis: Horizontal
+  m_VerticalAxis: Vertical
+  m_SubmitButton: Submit
+  m_CancelButton: Cancel
+  m_InputActionsPerSecond: 10
+  m_RepeatDelay: 0.5
+  m_ForceModuleActive: 0
+--- !u!114 &2010453062
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2010453060}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 5
+--- !u!4 &2010453063
+Transform:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 2010453060}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/spine-unity/Assets/Examples/Scripts/MixAndMatch.cs b/spine-unity/Assets/Examples/Scripts/MixAndMatch.cs
index e48427cd2..9f0e69ea9 100644
--- a/spine-unity/Assets/Examples/Scripts/MixAndMatch.cs
+++ b/spine-unity/Assets/Examples/Scripts/MixAndMatch.cs
@@ -54,6 +54,7 @@ namespace Spine.Unity.Examples {
 
 		[Header("Runtime Repack")]
 		public bool repack = true;
+		public BoundingBoxFollower bbFollower;
 
 		[Header("Do not assign")]
 		public Texture2D runtimeAtlas;
@@ -122,6 +123,7 @@ namespace Spine.Unity.Examples {
 				repackedSkin.Append(customSkin);
 				repackedSkin = repackedSkin.GetRepackedSkin("repacked skin", sourceMaterial, out runtimeMaterial, out runtimeAtlas);
 				skeleton.SetSkin(repackedSkin);
+				if (bbFollower != null) bbFollower.Initialize(true);
 			} else {
 				skeleton.SetSkin(customSkin);
 			}
diff --git a/spine-unity/Assets/spine-unity/Modules/BoundingBoxFollower/BoundingBoxFollower.cs b/spine-unity/Assets/spine-unity/Modules/BoundingBoxFollower/BoundingBoxFollower.cs
index 1de67d42f..00e74d18b 100644
--- a/spine-unity/Assets/spine-unity/Modules/BoundingBoxFollower/BoundingBoxFollower.cs
+++ b/spine-unity/Assets/spine-unity/Modules/BoundingBoxFollower/BoundingBoxFollower.cs
@@ -115,7 +115,8 @@ namespace Spine.Unity {
 				foreach (var skin in skeleton.Data.Skins)
 					AddSkin(skin, slotIndex);
 
-				AddSkin(skeleton.skin, slotIndex);
+				if (skeleton.skin != null)
+					AddSkin(skeleton.skin, slotIndex);
 			}
 
 			if (BoundingBoxFollower.DebugMessages) {