AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2024-12-29 18:55:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: issues when handling VRCExpressionMenus with an uninitialized type field (#1303)

Browse Source
This commit is contained in:
bd_ 2024-10-19 17:46:31 -07:00 committed by GitHub
parent 123523540e
commit 11a62c88d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Editor/Inspector/Menu/MenuItemGUI.cs
View File

@ -301,10 +301,9 @@ namespace nadena.dev.modular_avatar.core.editor
EditorGUILayout.BeginVertical(); EditorGUILayout.BeginVertical();
if (_type.hasMultipleDifferentValues) return; if (_type.hasMultipleDifferentValues) return;
VRCExpressionsMenu.Control.ControlType type = var controlTypeArray = Enum.GetValues(typeof(VRCExpressionsMenu.Control.ControlType));
(VRCExpressionsMenu.Control.ControlType) Enum var index = Math.Clamp(_type.enumValueIndex, 0, controlTypeArray.Length - 1);
.GetValues(typeof(VRCExpressionsMenu.Control.ControlType)) var type = (VRCExpressionsMenu.Control.ControlType)controlTypeArray.GetValue(index);
.GetValue(_type.enumValueIndex);
switch (type) switch (type)
{ {

4
Editor/Menu/MenuExtractor.cs
View File

@ -119,9 +119,11 @@ namespace nadena.dev.modular_avatar.core.editor
internal static VRCExpressionsMenu.Control CloneControl(VRCExpressionsMenu.Control c) internal static VRCExpressionsMenu.Control CloneControl(VRCExpressionsMenu.Control c)
{ {
var type = c.type != 0 ? c.type : VRCExpressionsMenu.Control.ControlType.Button;
return new VRCExpressionsMenu.Control() return new VRCExpressionsMenu.Control()
{ {
type = c.type, type = type,
name = c.name, name = c.name,
icon = c.icon, icon = c.icon,
parameter = new VRCExpressionsMenu.Control.Parameter() { name = c.parameter?.name }, parameter = new VRCExpressionsMenu.Control.Parameter() { name = c.parameter?.name },