UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-22 02:06:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed warnings.

Browse Source
This commit is contained in:
NathanSweet 2015-03-29 00:48:18 +01:00
parent 668534a687
commit f9e0e103b8
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spine-unity/Assets/spine-unity/SkeletonRenderer.cs
View File

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

2
spine-unity/Assets/spine-unity/SkeletonUtility/SkeletonUtility.cs
View File

@ -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) { 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; Skin skin;
if (skinName == "") if (skinName == "")