Do not include non-enable installers in the path search.

This commit is contained in:
raiti-chan 2022-12-14 19:26:48 +09:00
parent fc3ee7a47f
commit 99167df170

View File

@ -264,11 +264,11 @@ 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>()
.Where(menuInstaller => menuInstaller.enabled && menuInstaller.menuToAppend != null);
foreach (ModularAvatarMenuInstaller menuInstaller in menuInstallers) foreach (ModularAvatarMenuInstaller menuInstaller in menuInstallers)
{ {
if (menuInstaller == target) continue; if (menuInstaller == target) continue;
if (menuInstaller.menuToAppend == null) continue;
var visitedMenus = new HashSet<VRCExpressionsMenu>(); var visitedMenus = new HashSet<VRCExpressionsMenu>();
var queue = new Queue<VRCExpressionsMenu>(); var queue = new Queue<VRCExpressionsMenu>();
queue.Enqueue(menuInstaller.menuToAppend); queue.Enqueue(menuInstaller.menuToAppend);