Skip to content

Commit

Permalink
Merge pull request #127 from anatawa12/pb-1.0-allows-max-squish
Browse files Browse the repository at this point in the history
fix: we can use Max Squish in PhysBone 1.0
  • Loading branch information
anatawa12 authored May 2, 2023
2 parents d312fe6 + 89f57d0 commit 86e2ec3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG-PRERELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ The format is based on [Keep a Changelog].
### Removed

### Fixed
- Max Squish is not shown if we're using PhysBone 1.0 `#127`

### Security

Expand Down
3 changes: 1 addition & 2 deletions Editor/MergePhysBoneEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,7 @@ public void DoProcess()
if (CheckMinVersion(VRCPhysBoneBase.Version.Version_1_1))
PbCurveProp("Stretch Motion", "stretchMotion", "stretchMotionCurve", _stretchMotion);
PbCurveProp("Max Stretch", "maxStretch", "maxStretchCurve", _maxStretchProp);
if (CheckMinVersion(VRCPhysBoneBase.Version.Version_1_1))
PbCurveProp("Max Squish", "maxSquish", "maxSquishCurve", _maxSquish);
PbCurveProp("Max Squish", "maxSquish", "maxSquishCurve", _maxSquish);
}

// == Grab & Pose ==
Expand Down

0 comments on commit 86e2ec3

Please sign in to comment.