Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-22 10:34:54 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1124 from ousttrue/fix1/expression_custom_null

Browse Source 
add null check
This commit is contained in:
PoChang007
2021-08-03 13:41:23 +09:00
committed by GitHub
parent 8d193fd698 6dead3bcd8
commit cfffcb6c74
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,9 +45,13 @@ namespace UniVRM10
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;
foreach (var kv in expressions.Custom)
if (expressions.Custom != null)
{
yield return ExpressionKey.CreateCustom(kv.Key).SubAssetKey;
foreach (var kv in expressions.Custom)
{
yield return ExpressionKey.CreateCustom(kv.Key).SubAssetKey;
}
}
}

13
Assets/VRM10/Runtime/IO/Vrm10Importer.cs
View File

@@ -377,13 +377,16 @@ namespace UniVRM10
vrm.Expression.LookDown = GetOrLoadExpression(ExpressionKey.LookDown.SubAssetKey, vrmExtension.Expressions.Preset.LookDown);
vrm.Expression.LookLeft = GetOrLoadExpression(ExpressionKey.LookLeft.SubAssetKey, vrmExtension.Expressions.Preset.LookLeft);
vrm.Expression.LookRight = GetOrLoadExpression(ExpressionKey.LookRight.SubAssetKey, vrmExtension.Expressions.Preset.LookRight);
foreach (var (name, expression) in vrmExtension.Expressions.Custom)
if (vrmExtension.Expressions.Custom != null)
{
var key = ExpressionKey.CreateCustom(name);
var clip = GetOrLoadExpression(key.SubAssetKey, expression);
if (clip != null)
foreach (var (name, expression) in vrmExtension.Expressions.Custom)
{
vrm.Expression.AddClip(clip);
var key = ExpressionKey.CreateCustom(name);
var clip = GetOrLoadExpression(key.SubAssetKey, expression);
if (clip != null)
{
vrm.Expression.AddClip(clip);
}
}
}
}