From da97eeb62f963b89b36d1e15eb615b0dcb287681 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Thu, 2 May 2019 12:00:17 +0200 Subject: [PATCH] [unity] Menu section added for old git 3.7 branch menu, for easier consistent git merges later. Timeline support in Unity 2019, see #1326. --- .../spine-unity/Editor/SpineEditorUtilities.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs index ed5f91aae..1165e836e 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs @@ -430,7 +430,21 @@ namespace Spine.Unity.Editor { } } + #if NEW_TIMELINE_AS_PACKAGE + GUILayout.Space(20); + EditorGUILayout.LabelField("Timeline Support", EditorStyles.boldLabel); + using (new GUILayout.HorizontalScope()) { + EditorGUILayout.PrefixLabel("Timeline Package Support"); + var requestState = SpineEditorUtilities.SpinePackageDependencyUtility.HandlePendingAsyncTimelineRequest(); + using (new EditorGUI.DisabledGroupScope(requestState != SpineEditorUtilities.SpinePackageDependencyUtility.RequestState.NoRequestIssued)) { + if (GUILayout.Button("Enable", GUILayout.Width(64))) + SpineEditorUtilities.SpinePackageDependencyUtility.EnableTimelineSupport(); + if (GUILayout.Button("Disable", GUILayout.Width(64))) + SpineEditorUtilities.SpinePackageDependencyUtility.DisableTimelineSupport(); + } + } + #endif GUILayout.Space(20); EditorGUILayout.LabelField("3rd Party Settings", EditorStyles.boldLabel);