This commit is contained in:
raiti-chan 2022-12-08 22:21:22 +09:00
parent b3fe5c777e
commit f5a9d23fc5

View File

@ -293,31 +293,28 @@ namespace nadena.dev.modular_avatar.core.editor
}
}
private static ValidateExpressionMenuIconResult ValidateExpressionMenuIcon(VRCExpressionsMenu menu)
{
private static ValidateExpressionMenuIconResult ValidateExpressionMenuIcon(VRCExpressionsMenu menu) {
if (menu == null) return ValidateExpressionMenuIconResult.Success;
foreach (VRCExpressionsMenu.Control control in menu.controls)
{
foreach (VRCExpressionsMenu.Control control in menu.controls) {
// Control
ValidateExpressionMenuIconResult result = Util.ValidateExpressionMenuIcon(control.icon);
if (result != ValidateExpressionMenuIconResult.Success) return result;
// Labels
foreach (VRCExpressionsMenu.Control.Label label in control.labels)
{
foreach (VRCExpressionsMenu.Control.Label label in control.labels) {
ValidateExpressionMenuIconResult labelResult = Util.ValidateExpressionMenuIcon(label.icon);
if (labelResult != ValidateExpressionMenuIconResult.Success) return labelResult;
}
// SubMenu
if (control.type != VRCExpressionsMenu.Control.ControlType.SubMenu) continue;
ValidateExpressionMenuIconResult subMenuResult = ValidateExpressionMenuIcon(control.subMenu);
if (subMenuResult != ValidateExpressionMenuIconResult.Success) return subMenuResult;
}
return ValidateExpressionMenuIconResult.Success;
}
}
}