AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2024-12-29 18:55:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: error if MergeArmature is not under an avatar (#455)

Browse Source
This commit is contained in:
anatawa12 2023-09-27 18:34:20 +09:00 committed by GitHub
parent 64816e7e3c
commit 01ca90fd86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,8 +101,7 @@ namespace nadena.dev.modular_avatar.core.editor
EditorGUILayout.Separator();
var enable_name_assignment =
target.mergeTarget.Get(RuntimeUtil.FindAvatarInParents(target.transform)) != null;
var enable_name_assignment = target.mergeTarget.Get(target) != null;
using (var scope = new EditorGUI.DisabledScope(!enable_name_assignment))
{
if (GUILayout.Button(G("merge_armature.adjust_names")))
@ -114,4 +113,4 @@ namespace nadena.dev.modular_avatar.core.editor
Localization.ShowLanguageUI();
}
}
}
}