From f35d8fa8e7a4464d142930f35b083f3db8066b17 Mon Sep 17 00:00:00 2001
From: mob-sakai <sakai861104@gmail.com>
Date: Tue, 11 Dec 2018 16:23:41 +0900
Subject: [PATCH] fix #16; Using prefab view will cause a lot of errors

---
 .../UIExtensions/UIParticle/UIParticle.cs       | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs b/Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs
index 95a1425..b48afc8 100644
--- a/Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs
+++ b/Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs
@@ -19,7 +19,7 @@ namespace Coffee.UIExtensions
 		static readonly int s_IdMainTex = Shader.PropertyToID ("_MainTex");
 		static readonly List<Vector3> s_Vertices = new List<Vector3> ();
 		static readonly List<UIParticle> s_TempRelatables = new List<UIParticle> ();
-		static readonly List<UIParticle> s_ActiveSoftMasks = new List<UIParticle> ();
+		static readonly List<UIParticle> s_ActiveParticles = new List<UIParticle> ();
 
 
 		//################################
@@ -109,11 +109,11 @@ namespace Coffee.UIExtensions
 		protected override void OnEnable ()
 		{
 			// Register.
-			if (s_ActiveSoftMasks.Count == 0)
+			if (s_ActiveParticles.Count == 0)
 			{
 				Canvas.willRenderCanvases += UpdateMeshes;
 			}
-			s_ActiveSoftMasks.Add (this);
+			s_ActiveParticles.Add (this);
 
 			// Reset the parent-child relation.
 			GetComponentsInChildren<UIParticle> (false, s_TempRelatables);
@@ -137,8 +137,8 @@ namespace Coffee.UIExtensions
 		protected override void OnDisable ()
 		{
 			// Unregister.
-			s_ActiveSoftMasks.Remove (this);
-			if (s_ActiveSoftMasks.Count == 0)
+			s_ActiveParticles.Remove (this);
+			if (s_ActiveParticles.Count == 0)
 			{
 				Canvas.willRenderCanvases -= UpdateMeshes;
 			}
@@ -208,9 +208,12 @@ namespace Coffee.UIExtensions
 
 		static void UpdateMeshes ()
 		{
-			foreach (var uip in s_ActiveSoftMasks)
+			foreach (var uip in s_ActiveParticles)
 			{
-				uip.UpdateMesh ();
+				if(uip)
+				{
+					uip.UpdateMesh ();
+				}
 			}
 		}