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

Merge branch 'master' into fix/VRM10SpringBoneJointEditor_m_script

Browse Source
This commit is contained in:
ousttrue 2025-08-07 17:52:08 +09:00 committed by GitHub
commit 55cd368202
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/VRM10/Runtime/Components/Expression/ExpressionMerger.cs
View File

@ -71,11 +71,6 @@ namespace UniVRM10
m_materialValueBindingMerger.AccumulateValue(clip, value);
}
public void RestoreMaterialInitialValues()
{
m_materialValueBindingMerger.RestoreMaterialInitialValues();
}
public void Dispose()
{
m_materialValueBindingMerger.Dispose();

11
Assets/VRM10/Runtime/Components/Expression/MaterialValueBindingMerger.cs
View File

@ -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

5
Assets/VRM10/Runtime/Components/Vrm10Runtime/Vrm10RuntimeExpression.cs
View File

@ -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)