Merge remote-tracking branch 'origin/master'

This commit is contained in:
NathanSweet 2013-06-28 10:41:15 +02:00
commit 95ceb64920

View File

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