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

Don't remap references to the animator itself

Browse Source
This commit is contained in:
bd_ 2022-08-29 14:00:40 -07:00
parent 757eaa9a85
commit 5b52ad45c1
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Packages/net.fushizen.modular-avatar/Editor/AnimatorMerger.cs
View File

@ -93,6 +93,18 @@ namespace net.fushizen.modular_avatar.core.editor
return asm; return asm;
} }
private static string MapPath(EditorCurveBinding binding, string basePath)
{
if (binding.type == typeof(Animator) && binding.path == "")
{
return "";
}
else
{
return PathMappings.MapPath(basePath + binding.path);
}
}
private Object customClone(Object o, string basePath) private Object customClone(Object o, string basePath)
{ {
if (basePath == "") return null; if (basePath == "") return null;
@ -106,7 +118,7 @@ namespace net.fushizen.modular_avatar.core.editor
foreach (var binding in AnimationUtility.GetCurveBindings(clip)) foreach (var binding in AnimationUtility.GetCurveBindings(clip))
{ {
var newBinding = binding; var newBinding = binding;
newBinding.path = PathMappings.MapPath(basePath + binding.path); newBinding.path = MapPath(binding, basePath);
newClip.SetCurve(newBinding.path, newBinding.type, newBinding.propertyName, newClip.SetCurve(newBinding.path, newBinding.type, newBinding.propertyName,
AnimationUtility.GetEditorCurve(clip, binding)); AnimationUtility.GetEditorCurve(clip, binding));
} }
@ -114,7 +126,7 @@ namespace net.fushizen.modular_avatar.core.editor
foreach (var objBinding in AnimationUtility.GetObjectReferenceCurveBindings(clip)) foreach (var objBinding in AnimationUtility.GetObjectReferenceCurveBindings(clip))
{ {
var newBinding = objBinding; var newBinding = objBinding;
newBinding.path = PathMappings.MapPath(basePath + objBinding.path); newBinding.path = MapPath(objBinding, basePath);
AnimationUtility.SetObjectReferenceCurve(newClip, newBinding, AnimationUtility.SetObjectReferenceCurve(newClip, newBinding,
AnimationUtility.GetObjectReferenceCurve(clip, objBinding)); AnimationUtility.GetObjectReferenceCurve(clip, objBinding));
} }