From dfd5eceae5b3d8a2921145b96b7cd603aca87434 Mon Sep 17 00:00:00 2001
From: notargs <notargs@popopo.co.jp>
Date: Thu, 7 Aug 2025 13:25:04 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=83=86=E3=83=AA=E3=82=A2=E3=83=AB?=
 =?UTF-8?q?=E3=81=8C=E6=AD=A3=E5=B8=B8=E3=81=AB=E9=96=8B=E6=94=BE=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Runtime/Components/Expression/ExpressionMerger.cs |  5 -----
 .../Expression/MaterialValueBindingMerger.cs          | 11 -----------
 .../Components/Vrm10Runtime/Vrm10RuntimeExpression.cs |  5 +----
 3 files changed, 1 insertion(+), 20 deletions(-)

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
                 }
             }
         }
-
-        /// <summary>
-        /// m_materialMap に記録した値に Material を復旧する
-        /// </summary>
-        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)