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

Merge pull request #1690 from ousttrue/fix/VrmMeshIntegratorWizard

Browse Source 
OnValidate で m_excludes を Validate しているのだが、 Validate する前にクリアしていて情報が落ちている
This commit is contained in:
ousttrue 2022-06-13 17:27:57 +09:00 committed by GitHub
commit 19bd1116da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Assets/VRM/Editor/SkinnedMeshUtility/VrmMeshIntegratorWizard.cs
View File

@ -184,6 +184,7 @@ namespace VRM
return;
}
var backup = m_excludes.ToArray();
Clear(HelpMessage.Ready, ValidationError.None);
isValid = true;
m_uniqueMaterials = MeshIntegratorUtility.EnumerateSkinnedMeshRenderer(m_root.transform, MeshEnumerateOption.OnlyWithoutBlendShape)
@ -198,6 +199,11 @@ namespace VRM
.ToArray()
;
UpdateExcludes(backup);
}
void UpdateExcludes(ExcludeItem[] backup)
{
var exclude_map = new Dictionary<Mesh, ExcludeItem>();
var excludes = new List<ExcludeItem>();
foreach (var x in m_root.GetComponentsInChildren<Renderer>())
@ -207,23 +213,24 @@ namespace VRM
{
continue;
}
var item = new ExcludeItem { Mesh = mesh };
if (exclude_map.ContainsKey(mesh))
{
continue;
}
var item = new ExcludeItem
{
Mesh = mesh,
};
var found = backup.FirstOrDefault(y => y.Mesh == mesh);
if (found != null)
{
item.Exclude = found.Exclude;
}
excludes.Add(item);
exclude_map[mesh] = item;
}
foreach (var x in m_excludes)
{
if (exclude_map.TryGetValue(x.Mesh, out ExcludeItem item))
{
// update
item.Exclude = x.Exclude;
}
}
m_excludes.Clear();
foreach (var kv in exclude_map)
{
m_excludes.Add(kv.Value);
}
m_excludes.AddRange(excludes);
}
void OnWizardUpdate()