Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-08 11:59:26 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #203 from dwango/santarh/fix_uniunlit_inspector_cull_mode_bug

Browse Source 
Fix UniUnlit inspector's bug, cull mode was empty.
This commit is contained in:
ousttrue
2019-02-28 03:25:34 +09:00
committed by GitHub
parent 232c454604 c0498fc01d
commit ea16b9ac7c
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/VRM/UniUnlit/Editor/UniUnlitEditor.cs
View File

@@ -124,14 +124,24 @@ namespace UniGLTF.UniUnlit
private static bool PopupEnum<T>(string name, MaterialProperty property, MaterialEditor editor) where T : struct
{
if (!typeof(T).IsEnum) return false;
EditorGUI.showMixedValue = property.hasMixedValue;
EditorGUI.BeginChangeCheck();
var ret = EditorGUILayout.Popup(name, (int) property.floatValue, Enum.GetNames(typeof(T)));
var values = (T[]) Enum.GetValues(typeof(T));
var names = Enum.GetNames(typeof(T));
var currInt = (int) property.floatValue;
var currValue = (T) Enum.ToObject(typeof(T), currInt);
var currIndex = Array.IndexOf(values, currValue);
var nextIndex = EditorGUILayout.Popup(name, currIndex, names);
var changed = EditorGUI.EndChangeCheck();
if (changed)
{
editor.RegisterPropertyChangeUndo("EnumPopUp");
property.floatValue = ret;
var nextValue = values[nextIndex];
var nextInt = (int) (object) nextValue;
property.floatValue = nextInt;
}
EditorGUI.showMixedValue = false;
return changed;