include inactive

This commit is contained in:
raiti-chan 2022-12-14 23:09:14 +09:00
parent ca575eed91
commit f7a1cf9b37
2 changed files with 2 additions and 2 deletions

View File

@ -128,7 +128,7 @@ namespace nadena.dev.modular_avatar.core.editor
_menuTree = new MenuTree(Avatar); _menuTree = new MenuTree(Avatar);
_menuTree.AvatarsMenuMapping(); _menuTree.AvatarsMenuMapping();
foreach (ModularAvatarMenuInstaller installer in this.Avatar.gameObject.GetComponentsInChildren<ModularAvatarMenuInstaller>()) { foreach (ModularAvatarMenuInstaller installer in this.Avatar.gameObject.GetComponentsInChildren<ModularAvatarMenuInstaller>(true)) {
if (installer == Installer) continue; if (installer == Installer) continue;
this._menuTree.MappingMenuInstaller(installer); this._menuTree.MappingMenuInstaller(installer);
} }

View File

@ -264,7 +264,7 @@ namespace nadena.dev.modular_avatar.core.editor
_menuInstallersMap = new Dictionary<VRCExpressionsMenu, List<ModularAvatarMenuInstaller>>(); _menuInstallersMap = new Dictionary<VRCExpressionsMenu, List<ModularAvatarMenuInstaller>>();
var avatar = RuntimeUtil.FindAvatarInParents(((Component)target).transform); var avatar = RuntimeUtil.FindAvatarInParents(((Component)target).transform);
if (avatar == null) return; if (avatar == null) return;
var menuInstallers = avatar.GetComponentsInChildren<ModularAvatarMenuInstaller>() var menuInstallers = avatar.GetComponentsInChildren<ModularAvatarMenuInstaller>(true)
.Where(menuInstaller => menuInstaller.enabled && menuInstaller.menuToAppend != null); .Where(menuInstaller => menuInstaller.enabled && menuInstaller.menuToAppend != null);
foreach (ModularAvatarMenuInstaller menuInstaller in menuInstallers) foreach (ModularAvatarMenuInstaller menuInstaller in menuInstallers)
{ {