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

Merge pull request #1720 from ousttrue/feature/VRMBlendShapeProxy.Clear

Browse Source 
runtime に BlendShapeProxy.m_merger を再初期化する
This commit is contained in:
ousttrue 2022-06-29 13:10:44 +09:00 committed by GitHub
commit efdbef51d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Assets/VRM/Runtime/BlendShape/VRMBlendShapeProxy.cs
View File

@ -17,9 +17,10 @@ namespace VRM
}
BlendShapeMerger m_merger;
bool m_destroyed = false;
private void OnDestroy()
{
m_destroyed = true;
if (m_merger != null)
{
m_merger.RestoreMaterialInitialValues(BlendShapeAvatar.Clips);
@ -28,13 +29,25 @@ namespace VRM
private void Start()
{
if (BlendShapeAvatar != null)
if (m_destroyed)
{
if (m_merger == null)
{
m_merger = new BlendShapeMerger(BlendShapeAvatar.Clips, transform);
}
return;
}
if (BlendShapeAvatar == null)
{
return;
}
// m_merger の null check は必用か？
m_merger = new BlendShapeMerger(BlendShapeAvatar.Clips, transform);
}
/// <summary>
/// m_merger を(再)作成する。
/// BlendShapeAvatar.Clips に対する変更を反映できます。
/// </summary>
public void Reinitialize()
{
Start();
}
/// <summary>