AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-02-21 13:45:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: potential null ref exceptions from scale adjuster (#767)

Browse Source
This commit is contained in:
bd_ 2024-03-10 19:20:34 -07:00 committed by GitHub
parent a801f0ee76
commit 3f50da35f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/ScaleAdjuster/ModularAvatarScaleAdjuster.cs
View File

@ -54,6 +54,12 @@ namespace nadena.dev.modular_avatar.core
internal void PreCull() internal void PreCull()
{ {
if (this == null)
{
EditorApplication.delayCall += () => ProxyManager.UnregisterAdjuster(this);
return;
}
if (PrefabUtility.IsPartOfPrefabAsset(this)) return; if (PrefabUtility.IsPartOfPrefabAsset(this)) return;
if (scaleProxyChild == null || initialized == false) if (scaleProxyChild == null || initialized == false)

8
Runtime/ScaleAdjuster/ProxyManager.cs
View File

@ -102,6 +102,10 @@ namespace nadena.dev.modular_avatar.core
// Give each adjuster a chance to initialize the bone mappings first // Give each adjuster a chance to initialize the bone mappings first
foreach (var adj in _capturedAdjusters) foreach (var adj in _capturedAdjusters)
{ {
if (adj == null)
{
_capturedAdjusters = _adjusters = _adjusters.Remove(adj);
}
adj.PreCull(); adj.PreCull();
} }
@ -255,6 +259,10 @@ namespace nadena.dev.modular_avatar.core
foreach (var adj in _capturedAdjusters) foreach (var adj in _capturedAdjusters)
{ {
if (adj == null)
{
_capturedAdjusters = _capturedAdjusters.Remove(adj);
}
adj.PreCull(); // update scale adj.PreCull(); // update scale
} }