From ee6929cee5a73b5b50cf004ce1687d76b4db9836 Mon Sep 17 00:00:00 2001 From: bd_ Date: Wed, 22 Feb 2023 23:03:59 +0900 Subject: [PATCH] rename external => menuasset --- .../EditModeTests/VirtualMenuTests/VirtualMenuTests.cs | 2 +- .../Editor/MenuGeneration/VirtualMenu.cs | 2 +- .../Runtime/ModularAvatarMenuItem.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/_ModularAvatar/EditModeTests/VirtualMenuTests/VirtualMenuTests.cs b/Assets/_ModularAvatar/EditModeTests/VirtualMenuTests/VirtualMenuTests.cs index b5abe2e9..ec407a59 100644 --- a/Assets/_ModularAvatar/EditModeTests/VirtualMenuTests/VirtualMenuTests.cs +++ b/Assets/_ModularAvatar/EditModeTests/VirtualMenuTests/VirtualMenuTests.cs @@ -347,7 +347,7 @@ namespace modular_avatar_tests.VirtualMenuTests var item_a = installer_a.gameObject.AddComponent(); item_a.Control = GenerateTestControl(); item_a.Control.type = VRCExpressionsMenu.Control.ControlType.SubMenu; - item_a.MenuSource = SubmenuSource.External; + item_a.MenuSource = SubmenuSource.MenuAsset; item_a.Control.subMenu = menu_a; installer_b.menuToAppend = menu_b; diff --git a/Packages/nadena.dev.modular-avatar/Editor/MenuGeneration/VirtualMenu.cs b/Packages/nadena.dev.modular-avatar/Editor/MenuGeneration/VirtualMenu.cs index 7387d9e2..73ff5f71 100644 --- a/Packages/nadena.dev.modular-avatar/Editor/MenuGeneration/VirtualMenu.cs +++ b/Packages/nadena.dev.modular-avatar/Editor/MenuGeneration/VirtualMenu.cs @@ -353,7 +353,7 @@ namespace nadena.dev.modular_avatar.core.editor.menu switch (item.MenuSource) { - case SubmenuSource.External: + case SubmenuSource.MenuAsset: { if (item.Control.subMenu != null) { diff --git a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuItem.cs b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuItem.cs index 640c4b81..f3de9ba9 100644 --- a/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuItem.cs +++ b/Packages/nadena.dev.modular-avatar/Runtime/ModularAvatarMenuItem.cs @@ -27,7 +27,7 @@ namespace nadena.dev.modular_avatar.core public enum SubmenuSource { - External, + MenuAsset, Children, } @@ -60,7 +60,7 @@ namespace nadena.dev.modular_avatar.core List controls = null; switch (MenuSource) { - case SubmenuSource.External: + case SubmenuSource.MenuAsset: controls = Control.subMenu?.controls?.ToList(); break; case SubmenuSource.Children: