From 13f433d13d9d60ed7b8070a7358f58acb978982a Mon Sep 17 00:00:00 2001 From: pharan Date: Mon, 29 Aug 2016 17:10:52 +0800 Subject: [PATCH] [unity] Fix compatibility with Unity 5.1. --- spine-unity/Assets/Examples/Scripts/SpineboyPole.cs | 2 +- .../Assets/spine-unity/Editor/SpineEditorUtilities.cs | 6 +++++- .../Assets/spine-unity/Modules/Ragdoll/SkeletonRagdoll.cs | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/spine-unity/Assets/Examples/Scripts/SpineboyPole.cs b/spine-unity/Assets/Examples/Scripts/SpineboyPole.cs index 9c4e8507c..319c6cb0b 100644 --- a/spine-unity/Assets/Examples/Scripts/SpineboyPole.cs +++ b/spine-unity/Assets/Examples/Scripts/SpineboyPole.cs @@ -8,7 +8,7 @@ public class SpineboyPole : MonoBehaviour { public SkeletonAnimation skeletonAnimation; public SkeletonRenderSeparator separator; - [Space] + [Space(18)] [SpineAnimation] public string run; [SpineAnimation] diff --git a/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs b/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs index fec3e770a..a065608d7 100644 --- a/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs +++ b/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs @@ -260,7 +260,11 @@ namespace Spine.Unity.Editor { EditorPrefs.SetFloat(DEFAULT_SCALE_KEY, defaultScale); EditorGUI.BeginChangeCheck(); - defaultShader = EditorGUILayout.DelayedTextField(new GUIContent("Default shader", "Default shader for materials auto-generated on import."), defaultShader); + #if UNITY_5_3_OR_NEWER + defaultShader = EditorGUILayout.DelayedTextField(new GUIContent("Default shader", "Default shader for materials auto-generated on import."), defaultShader); + #else + defaultShader = EditorGUILayout.TextField(new GUIContent("Default shader", "Default shader for materials auto-generated on import."), defaultShader); + #endif if (EditorGUI.EndChangeCheck()) EditorPrefs.SetString(DEFAULT_SHADER_KEY, defaultShader); diff --git a/spine-unity/Assets/spine-unity/Modules/Ragdoll/SkeletonRagdoll.cs b/spine-unity/Assets/spine-unity/Modules/Ragdoll/SkeletonRagdoll.cs index 5fdf93743..ffd57ae0e 100644 --- a/spine-unity/Assets/spine-unity/Modules/Ragdoll/SkeletonRagdoll.cs +++ b/spine-unity/Assets/spine-unity/Modules/Ragdoll/SkeletonRagdoll.cs @@ -24,7 +24,7 @@ namespace Spine.Unity.Modules { [Tooltip("Warning! You will have to re-enable and tune mix values manually if attempting to remove the ragdoll system.")] public bool disableIK = true; public bool disableOtherConstraints = false; - [Space] + [Space(18)] [Tooltip("Set RootRigidbody IsKinematic to true when Apply is called.")] public bool pinStartBone; [Tooltip("Enable Collision between adjacent ragdoll elements (IE: Neck and Head)")]