UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
NathanSweet 2013-06-28 10:41:15 +02:00
commit 95ceb64920
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-tk2d/Code/tk2dSpineSkeleton.cs
View File

@ -125,7 +125,6 @@ public class tk2dSpineSkeleton : MonoBehaviour, tk2dRuntime.ISpriteCollectionFor
} }
} }
renderer.sharedMaterial = skeletonDataAsset.spritesData.inst.materials[0];
#if UNITY_EDITOR #if UNITY_EDITOR
UpdateEditorGizmo(); UpdateEditorGizmo();
#endif #endif
@ -140,6 +139,9 @@ public class tk2dSpineSkeleton : MonoBehaviour, tk2dRuntime.ISpriteCollectionFor
if (attachment is RegionAttachment) quadCount++; if (attachment is RegionAttachment) quadCount++;
} }
#if UNITY_EDITOR
if (mesh.subMeshCount == submeshIndices.Count)
#endif
if (quadCount == cachedQuadCount) return; if (quadCount == cachedQuadCount) return;
cachedQuadCount = quadCount; cachedQuadCount = quadCount;