From aab24b233592f2274235039b5cd161f7557343d2 Mon Sep 17 00:00:00 2001 From: neon-izm Date: Thu, 17 Jan 2019 01:57:28 +0900 Subject: [PATCH 1/2] add execution order number (avoid order conflict with vrik) --- Assets/VRM/UniVRM/Scripts/SpringBone/VRMSpringBone.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/VRM/UniVRM/Scripts/SpringBone/VRMSpringBone.cs b/Assets/VRM/UniVRM/Scripts/SpringBone/VRMSpringBone.cs index 846584f04..8a5c0100e 100644 --- a/Assets/VRM/UniVRM/Scripts/SpringBone/VRMSpringBone.cs +++ b/Assets/VRM/UniVRM/Scripts/SpringBone/VRMSpringBone.cs @@ -7,7 +7,11 @@ namespace VRM { /// /// The base algorithm is http://rocketjump.skr.jp/unity3d/109/ of @ricopin416 + /// DefaultExecutionOrder(11000) means calclate springbone after FinaiIK( VRIK ) /// + #if UNITY_5_5_OR_NEWER + [DefaultExecutionOrder(11000)] + #endif public class VRMSpringBone : MonoBehaviour { [SerializeField] From 48c1e472ef288cea4ba753266b73924266cc382d Mon Sep 17 00:00:00 2001 From: neon-izm Date: Thu, 17 Jan 2019 02:03:03 +0900 Subject: [PATCH 2/2] springbone collider also need to set execution order --- .../UniVRM/Scripts/SpringBone/VRMSpringBoneColliderGroup.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/VRM/UniVRM/Scripts/SpringBone/VRMSpringBoneColliderGroup.cs b/Assets/VRM/UniVRM/Scripts/SpringBone/VRMSpringBoneColliderGroup.cs index 6158be9e8..27145ce2f 100644 --- a/Assets/VRM/UniVRM/Scripts/SpringBone/VRMSpringBoneColliderGroup.cs +++ b/Assets/VRM/UniVRM/Scripts/SpringBone/VRMSpringBoneColliderGroup.cs @@ -4,6 +4,9 @@ using UnityEngine; namespace VRM { + #if UNITY_5_5_OR_NEWER + [DefaultExecutionOrder(11001)] + #endif public class VRMSpringBoneColliderGroup : MonoBehaviour { [Serializable]