Skip to content

Commit

Permalink
Merge branch 'master' into remove-mesh-with-blendshape-with-merge-ski…
Browse files Browse the repository at this point in the history
…nned-mesh
  • Loading branch information
anatawa12 authored Sep 11, 2023
2 parents e7f484f + 71e80b6 commit 7195056
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-PRERELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ The format is based on [Keep a Changelog].

### Fixed
- MergeBone will break Normal and Tangent `#448`
- PhysBone for Animator Parameter disappears `#452`
- RemoveMeshByBlendShape on the SkinnedMeshRenderer with MergeSkinnedMesh not working `#451`

### Security
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,11 @@ void CollectTransforms(Transform bone)
// in PB, PB Colliders work only if Colliders are enabled
foreach (var physBoneCollider in physBone.colliders)
deps.AddActiveDependency(physBoneCollider, true);

// If parameter is not empty, the PB can be required for Animator Parameter so it's Entrypoint Component
// https://github.com/anatawa12/AvatarOptimizer/issues/450
if (!string.IsNullOrEmpty(physBone.parameter))
deps.EntrypointComponent = true;
});
AddParser<VRCPhysBoneColliderBase>((collector, deps, component) =>
{
Expand Down

0 comments on commit 7195056

Please sign in to comment.