AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2025-04-12 15:38:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: NPEs resulting from bones being deleted under armature lock (#448)

Browse Source 
Fixes: #447
This commit is contained in:
bd_ 2023-09-25 22:58:02 +09:00 committed by GitHub
parent 37309125ea
commit 11b10a82d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Packages/nadena.dev.modular-avatar/Runtime/ArmatureAwase/BidirectionalArmatureLock.cs
View File

@ -169,6 +169,12 @@ namespace nadena.dev.modular_avatar.core.armature_lock
// Check parents haven't changed // Check parents haven't changed
for (int i = 0; i < _baseBones.Length; i++) for (int i = 0; i < _baseBones.Length; i++)
{ {
if (_baseBones[i] == null || _mergeBones[i] == null || _baseParentBones[i] == null ||
_mergeParentBones[i] == null)
{
return false;
}
if (_baseBones[i].parent != _baseParentBones[i] || _mergeBones[i].parent != _mergeParentBones[i]) if (_baseBones[i].parent != _baseParentBones[i] || _mergeBones[i].parent != _mergeParentBones[i])
{ {
return false; return false;

8
Packages/nadena.dev.modular-avatar/Runtime/ArmatureAwase/OnewayArmatureLock.cs
View File

@ -174,6 +174,8 @@ namespace nadena.dev.modular_avatar.core.armature_lock
handle = default; handle = default;
if (_disposed) return false; if (_disposed) return false;
LastOp.Complete();
_fault.Value = 0; _fault.Value = 0;
_wroteAny.Value = 0; _wroteAny.Value = 0;
@ -199,6 +201,12 @@ namespace nadena.dev.modular_avatar.core.armature_lock
// Validate parents while that job is running // Validate parents while that job is running
for (int i = 0; i < _baseBones.Length; i++) for (int i = 0; i < _baseBones.Length; i++)
{ {
if (_baseBones[i] == null || _mergeBones[i] == null || _baseParentBones[i] == null ||
_mergeParentBones[i] == null)
{
return false;
}
if (_baseBones[i].parent != _baseParentBones[i] || _mergeBones[i].parent != _mergeParentBones[i]) if (_baseBones[i].parent != _baseParentBones[i] || _mergeBones[i].parent != _mergeParentBones[i])
{ {
return false; return false;