UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 14:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8' of https://github.com/esotericsoftware/spine-runtimes into 3.8

Browse Source
This commit is contained in:
badlogic 2021-05-17 13:33:34 +02:00
commit 20b39fd201
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -919,15 +919,14 @@ namespace Spine.Unity.Editor {
skeletonDataAsset.scale = SpineEditorUtilities.Preferences.defaultScale; skeletonDataAsset.scale = SpineEditorUtilities.Preferences.defaultScale;
skeletonDataAsset.blendModeMaterials.applyAdditiveMaterial = !SpineEditorUtilities.Preferences.UsesPMAWorkflow; skeletonDataAsset.blendModeMaterials.applyAdditiveMaterial = !SpineEditorUtilities.Preferences.UsesPMAWorkflow;
} }
AssetDatabase.CreateAsset(skeletonDataAsset, filePath); AssetDatabase.CreateAsset(skeletonDataAsset, filePath);
AssetDatabase.SaveAssets();
} else { } else {
skeletonDataAsset.atlasAssets = atlasAssets; skeletonDataAsset.atlasAssets = atlasAssets;
skeletonDataAsset.Clear(); skeletonDataAsset.Clear();
var skeletonData = skeletonDataAsset.GetSkeletonData(true);
BlendModeMaterialsUtility.UpdateBlendModeMaterials(skeletonDataAsset, ref skeletonData);
} }
var skeletonData = skeletonDataAsset.GetSkeletonData(true);
BlendModeMaterialsUtility.UpdateBlendModeMaterials(skeletonDataAsset, ref skeletonData);
AssetDatabase.SaveAssets();
return skeletonDataAsset; return skeletonDataAsset;
} else { } else {