Browse Source

Fixed warnings.

NathanSweet 10 years ago
parent
commit
f9e0e103b8

+ 9 - 8
spine-unity/Assets/spine-unity/SkeletonRenderer.cs

@@ -59,7 +59,7 @@ public class SkeletonRenderer : MonoBehaviour {
 	[HideInInspector]
 	public List<Slot> submeshSeparatorSlots = new List<Slot>();
 
-
+	private MeshRenderer meshRenderer;
 	private MeshFilter meshFilter;
 	private Mesh mesh1, mesh2;
 	private bool useMesh1;
@@ -76,8 +76,9 @@ public class SkeletonRenderer : MonoBehaviour {
 	public virtual void Reset () {
 		if (meshFilter != null)
 			meshFilter.sharedMesh = null;
-		if (GetComponent<Renderer>() != null)
-			GetComponent<Renderer>().sharedMaterial = null;
+
+		meshRenderer = GetComponent<MeshRenderer>();
+		if (meshRenderer != null) meshRenderer.sharedMaterial = null;
 
 		if (mesh1 != null) {
 			if (Application.isPlaying)
@@ -237,7 +238,7 @@ public class SkeletonRenderer : MonoBehaviour {
 			submeshMaterials.CopyTo(sharedMaterials);
 		else
 			sharedMaterials = submeshMaterials.ToArray();
-		GetComponent<Renderer>().sharedMaterials = sharedMaterials;
+		meshRenderer.sharedMaterials = sharedMaterials;
 
 		// Ensure mesh data is the right size.
 		Vector3[] vertices = this.vertices;
@@ -379,11 +380,11 @@ public class SkeletonRenderer : MonoBehaviour {
 		}
 
 		if (submeshRenderers.Length > 0) {
-			foreach (var smr in submeshRenderers) {
-				if (smr.submeshIndex < sharedMaterials.Length)
-					smr.SetMesh(this.renderer, useMesh1 ? mesh1 : mesh2, sharedMaterials[smr.submeshIndex]);
+			foreach (var submeshRenderer in submeshRenderers) {
+				if (submeshRenderer.submeshIndex < sharedMaterials.Length)
+					submeshRenderer.SetMesh(meshRenderer, useMesh1 ? mesh1 : mesh2, sharedMaterials[submeshRenderer.submeshIndex]);
 				else
-					smr.GetComponent<Renderer>().enabled = false;
+					submeshRenderer.GetComponent<Renderer>().enabled = false;
 			}
 		}
 

+ 1 - 1
spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs

@@ -58,7 +58,7 @@ public class SkeletonUtility : MonoBehaviour {
 	}
 
 	public static PolygonCollider2D AddBoundingBox (Skeleton skeleton, string skinName, string slotName, string attachmentName, Transform parent, bool isTrigger = true) {
-		List<Attachment> attachments = new List<Attachment>();
+		// List<Attachment> attachments = new List<Attachment>();
 		Skin skin;
 
 		if (skinName == "")