AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-04-24 13:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'BugFix/MenuInstalle_CircluarReferencing' into enhancement/AddSubMenuCreatorModule

Browse Source 
# Conflicts:
#	Packages/nadena.dev.modular-avatar/Editor/Inspector/MenuInstallerEditor.cs
This commit is contained in:
raiti-chan 2022-12-12 19:03:54 +09:00
commit 4e4a5b9e10
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Packages/nadena.dev.modular-avatar/Editor/Inspector/MenuInstallerEditor.cs
View File

@ -293,8 +293,14 @@ namespace nadena.dev.modular_avatar.core.editor
} }
} }
private static ValidateExpressionMenuIconResult ValidateExpressionMenuIcon(VRCExpressionsMenu menu) { private static ValidateExpressionMenuIconResult ValidateExpressionMenuIcon(VRCExpressionsMenu menu, HashSet<VRCExpressionsMenu> visitedMenus = null)
{
if (menu == null) return ValidateExpressionMenuIconResult.Success; if (menu == null) return ValidateExpressionMenuIconResult.Success;
if (visitedMenus == null) visitedMenus = new HashSet<VRCExpressionsMenu>();
if (visitedMenus.Contains(menu)) return ValidateExpressionMenuIconResult.Success;
visitedMenus.Add(menu);
foreach (VRCExpressionsMenu.Control control in menu.controls)
foreach (VRCExpressionsMenu.Control control in menu.controls) { foreach (VRCExpressionsMenu.Control control in menu.controls) {
// Control // Control
@ -309,7 +315,7 @@ namespace nadena.dev.modular_avatar.core.editor
// SubMenu // SubMenu
if (control.type != VRCExpressionsMenu.Control.ControlType.SubMenu) continue; if (control.type != VRCExpressionsMenu.Control.ControlType.SubMenu) continue;
ValidateExpressionMenuIconResult subMenuResult = ValidateExpressionMenuIcon(control.subMenu); ValidateExpressionMenuIconResult subMenuResult = ValidateExpressionMenuIcon(control.subMenu, visitedMenus);
if (subMenuResult != ValidateExpressionMenuIconResult.Success) return subMenuResult; if (subMenuResult != ValidateExpressionMenuIconResult.Success) return subMenuResult;
} }