Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-04-25 15:47:26 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

null check

Browse Source
This commit is contained in:
ousttrue 2021-08-03 14:57:05 +09:00
parent cfffcb6c74
commit 6951519a79
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Assets/VRM10/Editor/ScriptedImporter/VrmScriptedImporterEditorGUI.cs
View File

@ -28,23 +28,28 @@ namespace UniVRM10
IEnumerable<SubAssetKey> EnumerateExpressinKeys(UniGLTF.Extensions.VRMC_vrm.Expressions expressions)
{
if (expressions?.Preset?.Happy != null) yield return ExpressionKey.Happy.SubAssetKey;
if (expressions?.Preset?.Angry != null) yield return ExpressionKey.Angry.SubAssetKey;
if (expressions?.Preset?.Sad != null) yield return ExpressionKey.Sad.SubAssetKey;
if (expressions?.Preset?.Relaxed != null) yield return ExpressionKey.Relaxed.SubAssetKey;
if (expressions?.Preset?.Surprised != null) yield return ExpressionKey.Surprised.SubAssetKey;
if (expressions?.Preset?.Aa != null) yield return ExpressionKey.Aa.SubAssetKey;
if (expressions?.Preset?.Ih != null) yield return ExpressionKey.Ih.SubAssetKey;
if (expressions?.Preset?.Ou != null) yield return ExpressionKey.Ou.SubAssetKey;
if (expressions?.Preset?.Ee != null) yield return ExpressionKey.Ee.SubAssetKey;
if (expressions?.Preset?.Oh != null) yield return ExpressionKey.Oh.SubAssetKey;
if (expressions?.Preset?.Blink != null) yield return ExpressionKey.Blink.SubAssetKey;
if (expressions?.Preset?.BlinkLeft != null) yield return ExpressionKey.BlinkLeft.SubAssetKey;
if (expressions?.Preset?.BlinkRight != null) yield return ExpressionKey.BlinkRight.SubAssetKey;
if (expressions?.Preset?.LookUp != null) yield return ExpressionKey.LookUp.SubAssetKey;
if (expressions?.Preset?.LookDown != null) yield return ExpressionKey.LookDown.SubAssetKey;
if (expressions?.Preset?.LookLeft != null) yield return ExpressionKey.LookLeft.SubAssetKey;
if (expressions?.Preset?.LookRight != null) yield return ExpressionKey.LookRight.SubAssetKey;
if (expressions == null)
{
yield break;
}
if (expressions.Preset?.Happy != null) yield return ExpressionKey.Happy.SubAssetKey;
if (expressions.Preset?.Angry != null) yield return ExpressionKey.Angry.SubAssetKey;
if (expressions.Preset?.Sad != null) yield return ExpressionKey.Sad.SubAssetKey;
if (expressions.Preset?.Relaxed != null) yield return ExpressionKey.Relaxed.SubAssetKey;
if (expressions.Preset?.Surprised != null) yield return ExpressionKey.Surprised.SubAssetKey;
if (expressions.Preset?.Aa != null) yield return ExpressionKey.Aa.SubAssetKey;
if (expressions.Preset?.Ih != null) yield return ExpressionKey.Ih.SubAssetKey;
if (expressions.Preset?.Ou != null) yield return ExpressionKey.Ou.SubAssetKey;
if (expressions.Preset?.Ee != null) yield return ExpressionKey.Ee.SubAssetKey;
if (expressions.Preset?.Oh != null) yield return ExpressionKey.Oh.SubAssetKey;
if (expressions.Preset?.Blink != null) yield return ExpressionKey.Blink.SubAssetKey;
if (expressions.Preset?.BlinkLeft != null) yield return ExpressionKey.BlinkLeft.SubAssetKey;
if (expressions.Preset?.BlinkRight != null) yield return ExpressionKey.BlinkRight.SubAssetKey;
if (expressions.Preset?.LookUp != null) yield return ExpressionKey.LookUp.SubAssetKey;
if (expressions.Preset?.LookDown != null) yield return ExpressionKey.LookDown.SubAssetKey;
if (expressions.Preset?.LookLeft != null) yield return ExpressionKey.LookLeft.SubAssetKey;
if (expressions.Preset?.LookRight != null) yield return ExpressionKey.LookRight.SubAssetKey;
if (expressions.Custom != null)
{