mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-04 14:24:53 +08:00
Merge branch '3.8' of https://github.com/esotericsoftware/spine-runtimes into 3.8
This commit is contained in:
commit
20b39fd201
@ -919,15 +919,14 @@ namespace Spine.Unity.Editor {
|
||||
skeletonDataAsset.scale = SpineEditorUtilities.Preferences.defaultScale;
|
||||
skeletonDataAsset.blendModeMaterials.applyAdditiveMaterial = !SpineEditorUtilities.Preferences.UsesPMAWorkflow;
|
||||
}
|
||||
|
||||
AssetDatabase.CreateAsset(skeletonDataAsset, filePath);
|
||||
AssetDatabase.SaveAssets();
|
||||
} else {
|
||||
skeletonDataAsset.atlasAssets = atlasAssets;
|
||||
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;
|
||||
} else {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user