AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-01-01 20:25:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix animator cloning creating duplicate MonoScript objects (#116)

Browse Source 
Closes: #115
This commit is contained in:
bd_ 2022-11-30 12:42:57 -08:00 committed by GitHub
parent d66881fa80
commit 2530588fe0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Packages/nadena.dev.modular-avatar/Editor/AnimatorMerger.cs
View File

@ -231,11 +231,32 @@ namespace nadena.dev.modular_avatar.core.editor
{
if (original == null) return null;
// We want to avoid trying to copy assets not part of the animation system (eg - textures, meshes,
// MonoScripts...), so check for the types we care about here
switch (original)
{
case Texture _:
case Material _:
// Any object referenced by an animator that we intend to mutate needs to be listed here.
case Motion _:
case AnimatorController _:
case AnimatorState _:
case AnimatorStateMachine _:
case AnimatorStateTransition _:
case StateMachineBehaviour _:
break; // We want to clone these types
// Leave textures and script definitions alone
case Texture2D _:
case MonoScript _:
return original;
// Also avoid copying unknown scriptable objects.
// This ensures compatibility with e.g. avatar remote, which stores state information in a state
// behaviour referencing a custom ScriptableObject
case ScriptableObject _:
return original;
default:
throw new Exception($"Unknown type referenced from animator: {original.GetType()}");
}
if (cloneMap == null) cloneMap = new Dictionary<Object, Object>();

5
Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs
View File

@ -205,7 +205,10 @@ namespace nadena.dev.modular_avatar.core.editor
var queue = new Queue<AnimatorStateMachine>();
// Deep clone the animator
controller = Util.DeepCloneAnimator(controller);
if (!Util.IsTemporaryAsset(controller))
{
controller = Util.DeepCloneAnimator(controller);
}
var parameters = controller.parameters;
for (int i = 0; i < parameters.Length; i++)