From 4d2e9180f17d88f12b8536d29c13f5f1dcd75b43 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Tue, 23 Jul 2013 18:43:08 +0200 Subject: [PATCH] Fixed NPE when slot has no attachment. --- spine-tk2d/Code/tk2dSpineSkeleton.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/spine-tk2d/Code/tk2dSpineSkeleton.cs b/spine-tk2d/Code/tk2dSpineSkeleton.cs index 9e4463f41..769ef14ba 100644 --- a/spine-tk2d/Code/tk2dSpineSkeleton.cs +++ b/spine-tk2d/Code/tk2dSpineSkeleton.cs @@ -163,13 +163,12 @@ public class tk2dSpineSkeleton : MonoBehaviour, tk2dRuntime.ISpriteCollectionFor int drawCount = skeleton.DrawOrder.Count; for (int i = 0; i < drawCount; i++) { Attachment attachment = skeleton.DrawOrder[i].Attachment; + if (!(attachment is RegionAttachment)) continue; Material currentMaterial = skeletonDataAsset.spritesData.GetSpriteDefinition(attachment.Name).material; - if(!(attachment is RegionAttachment)) continue; + if (oldMaterial == null) oldMaterial = currentMaterial; - if(oldMaterial == null) oldMaterial = currentMaterial; - - if(oldMaterial != currentMaterial) { + if (oldMaterial != currentMaterial) { submeshIndices.Add(currentSubmesh.ToArray()); submeshMaterials.Add(oldMaterial); currentSubmesh.Clear();