From 570409cf44c5e4dce63420a2847cdbc757670179 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Tue, 22 Jan 2019 10:23:08 +0900 Subject: [PATCH] fixed BlendShapeProxy.OnDestroy --- .../Scripts/BlendShape/MaterialValueBindingMerger.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Assets/VRM/UniVRM/Scripts/BlendShape/MaterialValueBindingMerger.cs b/Assets/VRM/UniVRM/Scripts/BlendShape/MaterialValueBindingMerger.cs index ff37a011b..0dcb380a3 100644 --- a/Assets/VRM/UniVRM/Scripts/BlendShape/MaterialValueBindingMerger.cs +++ b/Assets/VRM/UniVRM/Scripts/BlendShape/MaterialValueBindingMerger.cs @@ -149,7 +149,13 @@ namespace VRM { valueName = valueName.Substring(0, valueName.Length - 2); } - material.SetColor(valueName, y.BaseValue); +#if UNITY_EDITOR + // restore only material with asset + if (!string.IsNullOrEmpty(UnityEditor.AssetDatabase.GetAssetPath(material))) + { + material.SetColor(valueName, y.BaseValue); + } +#endif } else {