Przeglądaj źródła

Merge branch '3.8' into 4.0-beta

Harald Csaszar 4 lat temu
rodzic
commit
af159db63a

+ 3 - 4
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/AssetUtility.cs

@@ -916,15 +916,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 {