소스 검색

Fixed NPE when slot has no attachment.

NathanSweet 12 년 전
부모
커밋
4d2e9180f1
1개의 변경된 파일3개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 4
      spine-tk2d/Code/tk2dSpineSkeleton.cs

+ 3 - 4
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();