diff --git a/Assets/VRM10/Runtime/Components/Expression/ExpressionMerger.cs b/Assets/VRM10/Runtime/Components/Expression/ExpressionMerger.cs index e178df0c5..dd54cb70d 100644 --- a/Assets/VRM10/Runtime/Components/Expression/ExpressionMerger.cs +++ b/Assets/VRM10/Runtime/Components/Expression/ExpressionMerger.cs @@ -71,11 +71,6 @@ namespace UniVRM10 m_materialValueBindingMerger.AccumulateValue(clip, value); } - public void RestoreMaterialInitialValues() - { - m_materialValueBindingMerger.RestoreMaterialInitialValues(); - } - public void Dispose() { m_materialValueBindingMerger.Dispose(); diff --git a/Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs b/Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs index 665b2b611..a78a088cd 100644 --- a/Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs +++ b/Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs @@ -138,17 +138,6 @@ namespace UniVRM10 } } } - - /// - /// m_materialMap に記録した値に Material を復旧する - /// - public void RestoreMaterialInitialValues() - { - foreach (var kv in m_materialMap) - { - kv.Value.Clear(); - } - } #endregion #region Accumulate diff --git a/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10RuntimeExpression.cs b/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10RuntimeExpression.cs index 902654f35..0a38b0481 100644 --- a/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10RuntimeExpression.cs +++ b/Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10RuntimeExpression.cs @@ -51,14 +51,11 @@ namespace UniVRM10 public void Dispose() { - _merger?.RestoreMaterialInitialValues(); + _merger?.Dispose(); _merger = null; _eyeDirectionApplicable?.Restore(); _eyeDirectionApplicable = null; - - _merger?.Dispose(); - _merger = null; } internal void Process(LookAtEyeDirection inputEyeDirection)