UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-28 20:51:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed Atlas asset assignment upon import which did not prioritize an atlas of the same name as the skeleton. Closes #1818.

Browse Source
This commit is contained in:
Harald Csaszar 2020-12-01 16:20:12 +01:00
parent f365815127
commit eb3d56c9e8
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Asset Types/SkeletonDataAssetInspector.cs
View File

@ -96,7 +96,8 @@ namespace Spine.Unity.Editor {
public void UpdateSkeletonData () { public void UpdateSkeletonData () {
preview.Clear(); preview.Clear();
InitializeEditor(); InitializeEditor();
EditorUtility.SetDirty(targetSkeletonDataAsset); if (targetSkeletonDataAsset)
EditorUtility.SetDirty(targetSkeletonDataAsset);
} }
void InitializeEditor () { void InitializeEditor () {

6
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs
View File

@ -324,9 +324,13 @@ namespace Spine.Unity.Editor {
#if SPINE_TK2D #if SPINE_TK2D
IngestSpineProject(loadedAsset, null); IngestSpineProject(loadedAsset, null);
#else #else
string skeletonName = Path.GetFileNameWithoutExtension(skeletonPath);
var atlasesForSkeleton = FindAtlasesAtPath(dir); var atlasesForSkeleton = FindAtlasesAtPath(dir);
atlasesForSkeleton.AddRange(newAtlases); atlasesForSkeleton = atlasesForSkeleton.Union(newAtlases).ToList();
var requiredPaths = GetRequiredAtlasRegions(skeletonPath); var requiredPaths = GetRequiredAtlasRegions(skeletonPath);
atlasesForSkeleton.Sort((a, b) => (
string.CompareOrdinal(b.name, skeletonName)
- string.CompareOrdinal(a.name, skeletonName)));
var atlasMatch = GetMatchingAtlas(requiredPaths, atlasesForSkeleton); var atlasMatch = GetMatchingAtlas(requiredPaths, atlasesForSkeleton);
if (atlasMatch != null || requiredPaths.Count == 0) { if (atlasMatch != null || requiredPaths.Count == 0) {
IngestSpineProject(loadedAsset, atlasMatch); IngestSpineProject(loadedAsset, atlasMatch);