doloro/av3-animation-as-crab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Do not require some assets to be persistent

Browse Source
This commit is contained in:
Haï~
2023-10-04 08:59:48 +02:00
parent e79400afa9
commit a43516f45e
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Packages/dev.hai-vr.animator-as-code.v1/V1/Editor/Aac.cs
+7
View File
@@ -58,6 +58,13 @@ namespace AnimatorAsCode.V1
if (container != null && EditorUtility.IsPersistent(container)) return container; if (container != null && EditorUtility.IsPersistent(container)) return container;
return null; return null;
} }
internal Object GetAssetContainer()
{
var container = AssetContainer != null ? AssetContainer : GenericAssetContainer;
if (container != null) return container;
return null;
}
} }
public class AacFlLayer public class AacFlLayer
Packages/dev.hai-vr.animator-as-code.v1/V1/Editor/AacInternals.cs
+4 -4
View File
@@ -29,7 +29,7 @@ namespace AnimatorAsCode.V1
{ {
clip.name = "zAutogenerated__" + component.AssetKey + "__" + suffix + "_" + Random.Range(0, Int32.MaxValue); // FIXME animation name conflict clip.name = "zAutogenerated__" + component.AssetKey + "__" + suffix + "_" + Random.Range(0, Int32.MaxValue); // FIXME animation name conflict
clip.hideFlags = HideFlags.None; clip.hideFlags = HideFlags.None;
if (component.GetPersistentAssetContainer() != null) AssetDatabase.AddObjectToAsset(clip, component.GetPersistentAssetContainer()); if (component.GetAssetContainer() != null) AssetDatabase.AddObjectToAsset(clip, component.GetAssetContainer());
return clip; return clip;
} }
@@ -38,7 +38,7 @@ namespace AnimatorAsCode.V1
var clip = new BlendTree(); var clip = new BlendTree();
clip.name = "zAutogenerated__" + component.AssetKey + "__" + suffix + "_" + Random.Range(0, Int32.MaxValue); // FIXME animation name conflict clip.name = "zAutogenerated__" + component.AssetKey + "__" + suffix + "_" + Random.Range(0, Int32.MaxValue); // FIXME animation name conflict
clip.hideFlags = HideFlags.None; clip.hideFlags = HideFlags.None;
if (component.GetPersistentAssetContainer() != null) AssetDatabase.AddObjectToAsset(clip, component.GetPersistentAssetContainer()); if (component.GetAssetContainer() != null) AssetDatabase.AddObjectToAsset(clip, component.GetAssetContainer());
return clip; return clip;
} }
@@ -47,7 +47,7 @@ namespace AnimatorAsCode.V1
var duplicated = (T)Object.Instantiate(assetToDuplicate); var duplicated = (T)Object.Instantiate(assetToDuplicate);
duplicated.name = "zAutogenerated__" + component.AssetKey + "__" + assetToDuplicate.name + "_" + Random.Range(0, Int32.MaxValue); // FIXME animation name conflict duplicated.name = "zAutogenerated__" + component.AssetKey + "__" + assetToDuplicate.name + "_" + Random.Range(0, Int32.MaxValue); // FIXME animation name conflict
duplicated.hideFlags = HideFlags.None; duplicated.hideFlags = HideFlags.None;
if (component.GetPersistentAssetContainer() != null) AssetDatabase.AddObjectToAsset(duplicated, component.GetPersistentAssetContainer()); if (component.GetAssetContainer() != null) AssetDatabase.AddObjectToAsset(duplicated, component.GetAssetContainer());
return duplicated; return duplicated;
} }
@@ -56,7 +56,7 @@ namespace AnimatorAsCode.V1
var avatarMask = new AvatarMask(); var avatarMask = new AvatarMask();
avatarMask.name = "zAutogenerated__" + component.AssetKey + "_" + fullLayerName + "__AvatarMask"; avatarMask.name = "zAutogenerated__" + component.AssetKey + "_" + fullLayerName + "__AvatarMask";
avatarMask.hideFlags = HideFlags.None; avatarMask.hideFlags = HideFlags.None;
if (component.GetPersistentAssetContainer() != null) AssetDatabase.AddObjectToAsset(avatarMask, component.GetPersistentAssetContainer()); if (component.GetAssetContainer() != null) AssetDatabase.AddObjectToAsset(avatarMask, component.GetAssetContainer());
return avatarMask; return avatarMask;
} }