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

Look at the material's texture name instead of the material name.

Browse Source
This commit is contained in:
NathanSweet 2013-08-05 07:22:48 +02:00
parent c202fc5d85
commit a2041fa9bb
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-unity/Assets/Spine/AtlasAsset.cs
View File

@ -74,13 +74,13 @@ public class MaterialsTextureLoader : TextureLoader {
String name = Path.GetFileNameWithoutExtension(path); String name = Path.GetFileNameWithoutExtension(path);
Material material = null; Material material = null;
foreach (Material other in atlasAsset.materials) { foreach (Material other in atlasAsset.materials) {
if (other.name == name) { if (other.mainTexture.name == name) {
material = other; material = other;
break; break;
} }
} }
if (material == null) { if (material == null) {
Debug.LogWarning("Material with name \"" + name + "\" not found for atlas asset: " + atlasAsset.name, atlasAsset); Debug.LogWarning("Material with texture name \"" + name + "\" not found for atlas asset: " + atlasAsset.name, atlasAsset);
return; return;
} }
page.rendererObject = material; page.rendererObject = material;

8
spine-unity/Assets/Spine/SkeletonComponent.cs
View File

@ -79,10 +79,14 @@ public class SkeletonComponent : MonoBehaviour {
} }
public virtual void Update () { public virtual void Update () {
if (skeletonDataAsset == null) {
Clear();
return;
}
SkeletonData skeletonData = skeletonDataAsset.GetSkeletonData(false); SkeletonData skeletonData = skeletonDataAsset.GetSkeletonData(false);
// Clear fields if missing information to render. if (skeletonData == null) {
if (skeletonDataAsset == null || skeletonData == null) {
Clear(); Clear();
return; return;
} }