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

[unity] Fixed compilation errors when TK2D define is set. Closes #1270.

Browse Source
This commit is contained in:
Harald Csaszar 2019-02-04 18:54:42 +01:00
parent b18d6574e8
commit 0d09fffb4c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -778,7 +778,7 @@ namespace Spine.Unity.Editor {
string dir = Path.GetDirectoryName(skeletonPath); string dir = Path.GetDirectoryName(skeletonPath);
#if SPINE_TK2D #if SPINE_TK2D
IngestSpineProject(AssetDatabase.LoadAssetAtPath<TextAsset>(sp), null); IngestSpineProject(AssetDatabase.LoadAssetAtPath<TextAsset>(skeletonPath), null);
#else #else
var localAtlases = FindAtlasesAtPath(dir); var localAtlases = FindAtlasesAtPath(dir);
var requiredPaths = GetRequiredAtlasRegions(skeletonPath); var requiredPaths = GetRequiredAtlasRegions(skeletonPath);
@ -1036,8 +1036,8 @@ namespace Spine.Unity.Editor {
skeletonDataAsset.fromAnimation = new string[0]; skeletonDataAsset.fromAnimation = new string[0];
skeletonDataAsset.toAnimation = new string[0]; skeletonDataAsset.toAnimation = new string[0];
skeletonDataAsset.duration = new float[0]; skeletonDataAsset.duration = new float[0];
skeletonDataAsset.defaultMix = defaultMix; skeletonDataAsset.defaultMix = SpineEditorUtilities.Preferences.defaultMix;
skeletonDataAsset.scale = defaultScale; skeletonDataAsset.scale = SpineEditorUtilities.Preferences.defaultScale;
AssetDatabase.CreateAsset(skeletonDataAsset, filePath); AssetDatabase.CreateAsset(skeletonDataAsset, filePath);
AssetDatabase.SaveAssets(); AssetDatabase.SaveAssets();