From 569275dcbae27b9e80ad8b23563811f5aba7d93e Mon Sep 17 00:00:00 2001 From: bd_ Date: Mon, 2 Jan 2023 16:40:10 +0900 Subject: [PATCH] fix: NPE on null submenu reference --- .../Editor/RenameParametersHook.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs b/Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs index e22d3a07..b4fba0e9 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/RenameParametersHook.cs @@ -127,7 +127,7 @@ namespace nadena.dev.modular_avatar.core.editor if (willPurgeAnimators) break; // animator will be deleted in subsequent processing // RuntimeAnimatorController may be AnimatorOverrideController, convert in case of AnimatorOverrideController - if (anim.runtimeAnimatorController is AnimatorOverrideController overrideController) + if (anim.runtimeAnimatorController is AnimatorOverrideController overrideController) { anim.runtimeAnimatorController = Util.ConvertAnimatorController(overrideController); } @@ -144,12 +144,12 @@ namespace nadena.dev.modular_avatar.core.editor case ModularAvatarMergeAnimator merger: { - // 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); } + var controller = merger.animator as AnimatorController; if (controller != null) { @@ -187,6 +187,8 @@ namespace nadena.dev.modular_avatar.core.editor VRCExpressionsMenu Transform(VRCExpressionsMenu menu) { + if (menu == null) return null; + if (remapped.TryGetValue(menu, out var newMenu)) return newMenu; newMenu = Object.Instantiate(menu);