From 69460f3bd64df5655237c63d84f6a22869831193 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Wed, 3 Nov 2021 19:46:41 +0100 Subject: [PATCH] [unity] Fixed SkeletonRagdoll2D behaviour being wrong in Unity 2020.3+. Closes #1977. --- .../SkeletonUtility Modules/SkeletonRagdoll2D.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs index 548f3c6ee..5b7851e32 100644 --- a/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs +++ b/spine-unity/Assets/Spine Examples/Scripts/Sample Components/SkeletonUtility Modules/SkeletonRagdoll2D.cs @@ -29,7 +29,7 @@ // Contributed by: Mitch Thompson -#if UNITY_2019_2_OR_NEWER +#if UNITY_2019_2 || UNITY_2019_3 || UNITY_2019_4 || UNITY_2020_1 || UNITY_2020_2 // note: 2020.3+ uses old bahavior again #define HINGE_JOINT_NEW_BEHAVIOUR #endif @@ -42,7 +42,7 @@ namespace Spine.Unity.Examples { public class SkeletonRagdoll2D : MonoBehaviour { static Transform parentSpaceHelper; - #region Inspector +#region Inspector [Header("Hierarchy")] [SpineBone] public string startingBoneName = ""; @@ -72,7 +72,7 @@ namespace Spine.Unity.Examples { [Range(0, 1)] public float mix = 1; public bool oldRagdollBehaviour = false; - #endregion +#endregion ISkeletonAnimation targetSkeletonComponent; Skeleton skeleton; @@ -110,7 +110,7 @@ namespace Spine.Unity.Examples { } } - #region API +#region API public Rigidbody2D[] RigidbodyArray { get { if (!isActive) @@ -299,7 +299,7 @@ namespace Spine.Unity.Examples { var bone = skeleton.FindBone(boneName); return (bone != null && boneTable.ContainsKey(bone)) ? boneTable[bone].GetComponent() : null; } - #endregion +#endregion /// Generates the ragdoll simulation's Transform and joint setup. void RecursivelyCreateBoneProxies (Bone b) {