Skip to content

Commit

Permalink
fix: unable to upload since editor using are used
Browse files Browse the repository at this point in the history
  • Loading branch information
poi-vrc committed Apr 28, 2024
1 parent 8a7b2e8 commit 797d786
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
6 changes: 5 additions & 1 deletion Editor/Passes/Animations/ManipulateAnimatorPass.cs
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,11 @@ private static bool TryGetSourceController(Transform avatarRoot, DTManipulateAni
{
relativeRoot = avatarRoot;
}
controller = comp.SourceController;
if (!(comp.SourceController is AnimatorController animCtrl))
{
return false;
}
controller = animCtrl;
return true;
}
else if (comp.SourceType == DTManipulateAnimator.SourceTypes.Animator)
Expand Down
9 changes: 4 additions & 5 deletions Runtime/Components/Animations/DTManipulateAnimator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
* You should have received a copy of the GNU General Public License along with DressingTools. If not, see <https://www.gnu.org/licenses/>.
*/

using UnityEditor.Animations;
using UnityEngine;

namespace Chocopoi.DressingTools.Components.Animations
Expand Down Expand Up @@ -59,7 +58,7 @@ public enum ManipulateModes
public VRC.SDK3.Avatars.Components.VRCAvatarDescriptor.AnimLayerType VRCTargetLayer { get => m_VRCTargetLayer; set => m_VRCTargetLayer = value; }
#endif
public Animator TargetAnimator { get => m_TargetAnimator; set => m_TargetAnimator = value; }
public AnimatorController TargetController { get => m_TargetController; set => m_TargetController = value; }
public RuntimeAnimatorController TargetController { get => m_TargetController; set => m_TargetController = value; }
public PathModes PathMode { get => m_PathMode; set => m_PathMode = value; }
public ManipulateModes ManipulateMode { get => m_ManipulateMode; set => m_ManipulateMode = value; }
public SourceTypes SourceType { get => m_SourceType; set => m_SourceType = value; }
Expand All @@ -69,7 +68,7 @@ public enum ManipulateModes
/// ignored and the animator root will be used.
/// </summary>
public Transform SourceRelativeRoot { get => m_SourceRelativeRoot; set => m_SourceRelativeRoot = value; }
public AnimatorController SourceController { get => m_SourceController; set => m_SourceController = value; }
public RuntimeAnimatorController SourceController { get => m_SourceController; set => m_SourceController = value; }
public Animator SourceAnimator { get => m_SourceAnimator; set => m_SourceAnimator = value; }
public bool RemoveSourceAnimator { get => m_RemoveSourceAnimator; set => m_RemoveSourceAnimator = value; }
public bool MatchTargetWriteDefaults { get => m_MatchTargetWriteDefaults; set => m_MatchTargetWriteDefaults = value; }
Expand All @@ -81,12 +80,12 @@ public enum ManipulateModes
[SerializeField] private int m_VRCTargetLayer;
#endif
[SerializeField] private Animator m_TargetAnimator;
[SerializeField] private AnimatorController m_TargetController;
[SerializeField] private RuntimeAnimatorController m_TargetController;
[SerializeField] private PathModes m_PathMode;
[SerializeField] private ManipulateModes m_ManipulateMode;
[SerializeField] private SourceTypes m_SourceType;
[SerializeField] private Transform m_SourceRelativeRoot;
[SerializeField] private AnimatorController m_SourceController;
[SerializeField] private RuntimeAnimatorController m_SourceController;
[SerializeField] private Animator m_SourceAnimator;
[SerializeField] private bool m_RemoveSourceAnimator;
[SerializeField] private bool m_MatchTargetWriteDefaults;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "com.chocopoi.vrc.dressingtools",
"displayName": "DressingTools",
"version": "2.5.0-beta.1",
"version": "2.5.0-beta.2",
"unity": "2019.4",
"description": "A simple but advanced, non-destructive cabinet system.",
"author": {
Expand Down

0 comments on commit 797d786

Please sign in to comment.