diff --git a/spine-unity/Assets/spine-unity/SkeletonRenderer.cs b/spine-unity/Assets/spine-unity/SkeletonRenderer.cs index 55364457a..b87c9ffcd 100644 --- a/spine-unity/Assets/spine-unity/SkeletonRenderer.cs +++ b/spine-unity/Assets/spine-unity/SkeletonRenderer.cs @@ -59,7 +59,7 @@ public class SkeletonRenderer : MonoBehaviour { [HideInInspector] public List submeshSeparatorSlots = new List(); - + 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() != null) - GetComponent().sharedMaterial = null; + + meshRenderer = GetComponent(); + 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().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().enabled = false; + submeshRenderer.GetComponent().enabled = false; } } diff --git a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs b/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs index c8d5ed97f..091c0139d 100644 --- a/spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs +++ b/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 attachments = new List(); + // List attachments = new List(); Skin skin; if (skinName == "")