AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-02-02 11:42:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: NPE on null submenu reference

Browse Source
This commit is contained in:
bd_ 2023-01-02 16:40:10 +09:00
parent a361789c43
commit 569275dcba
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,12 +144,12 @@ namespace nadena.dev.modular_avatar.core.editor
case ModularAvatarMergeAnimator merger: case ModularAvatarMergeAnimator merger:
{ {
// RuntimeAnimatorController may be AnimatorOverrideController, convert in case of AnimatorOverrideController // RuntimeAnimatorController may be AnimatorOverrideController, convert in case of AnimatorOverrideController
if (merger.animator is AnimatorOverrideController overrideController) if (merger.animator is AnimatorOverrideController overrideController)
{ {
merger.animator = Util.ConvertAnimatorController(overrideController); merger.animator = Util.ConvertAnimatorController(overrideController);
} }
var controller = merger.animator as AnimatorController; var controller = merger.animator as AnimatorController;
if (controller != null) if (controller != null)
{ {
@ -187,6 +187,8 @@ namespace nadena.dev.modular_avatar.core.editor
VRCExpressionsMenu Transform(VRCExpressionsMenu menu) VRCExpressionsMenu Transform(VRCExpressionsMenu menu)
{ {
if (menu == null) return null;
if (remapped.TryGetValue(menu, out var newMenu)) return newMenu; if (remapped.TryGetValue(menu, out var newMenu)) return newMenu;
newMenu = Object.Instantiate(menu); newMenu = Object.Instantiate(menu);