From da5849d1b9d10855ef835d49c4e7d81b985a3e76 Mon Sep 17 00:00:00 2001
From: pharan <johndygit@live.com.ph>
Date: Wed, 4 Jan 2017 00:58:03 +0800
Subject: [PATCH] [unity] Fix clearing invalid SkeletonRenderer and
 SkeletonAnimation.

---
 spine-unity/Assets/spine-unity/SkeletonAnimation.cs | 2 +-
 spine-unity/Assets/spine-unity/SkeletonRenderer.cs  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spine-unity/Assets/spine-unity/SkeletonAnimation.cs b/spine-unity/Assets/spine-unity/SkeletonAnimation.cs
index 5f92cd5ad..121443c60 100644
--- a/spine-unity/Assets/spine-unity/SkeletonAnimation.cs
+++ b/spine-unity/Assets/spine-unity/SkeletonAnimation.cs
@@ -129,7 +129,7 @@ namespace Spine.Unity {
 
 		protected override void ClearState () {
 			base.ClearState();
-			state.ClearTracks();
+			if (state != null) state.ClearTracks();
 		}
 
 		public override void Initialize (bool overwrite) {
diff --git a/spine-unity/Assets/spine-unity/SkeletonRenderer.cs b/spine-unity/Assets/spine-unity/SkeletonRenderer.cs
index 123a33b85..88e96e635 100644
--- a/spine-unity/Assets/spine-unity/SkeletonRenderer.cs
+++ b/spine-unity/Assets/spine-unity/SkeletonRenderer.cs
@@ -161,14 +161,14 @@ namespace Spine.Unity {
 		}
 
 		void OnDisable () {
-			if (clearStateOnDisable)
+			if (clearStateOnDisable && valid)
 				ClearState();
 		}
 
 		protected virtual void ClearState () {
 			meshFilter.sharedMesh = null;
 			currentInstructions.Clear();
-			skeleton.SetToSetupPose();
+			if (skeleton != null) skeleton.SetToSetupPose();
 		}
 
 		public virtual void Initialize (bool overwrite) {