From debc5801c85480dd440ee64cb5e2d82e22a64b68 Mon Sep 17 00:00:00 2001 From: pharan Date: Sun, 13 May 2018 03:19:03 +0800 Subject: [PATCH] [unity] Handle obsolete APIs in 2018.1 --- .../Assets/spine-unity/Editor/SpineEditorUtilities.cs | 8 ++++++++ .../Modules/Shaders/Sprite/Editor/SpineSpriteShaderGUI.cs | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs b/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs index d1c4d330f..8e6472ddd 100644 --- a/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs +++ b/spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs @@ -487,11 +487,19 @@ namespace Spine.Unity.Editor { skeletonUtilityBoneTable.Clear(); boundingBoxFollowerTable.Clear(); + #if UNITY_2018 + EditorApplication.hierarchyChanged -= HierarchyIconsOnChanged; + #else EditorApplication.hierarchyWindowChanged -= HierarchyIconsOnChanged; + #endif EditorApplication.hierarchyWindowItemOnGUI -= HierarchyIconsOnGUI; if (!Application.isPlaying && showHierarchyIcons) { + #if UNITY_2018 + EditorApplication.hierarchyChanged += HierarchyIconsOnChanged; + #else EditorApplication.hierarchyWindowChanged += HierarchyIconsOnChanged; + #endif EditorApplication.hierarchyWindowItemOnGUI += HierarchyIconsOnGUI; HierarchyIconsOnChanged(); } diff --git a/spine-unity/Assets/spine-unity/Modules/Shaders/Sprite/Editor/SpineSpriteShaderGUI.cs b/spine-unity/Assets/spine-unity/Modules/Shaders/Sprite/Editor/SpineSpriteShaderGUI.cs index 176a6e0a1..c51eda11d 100644 --- a/spine-unity/Assets/spine-unity/Modules/Shaders/Sprite/Editor/SpineSpriteShaderGUI.cs +++ b/spine-unity/Assets/spine-unity/Modules/Shaders/Sprite/Editor/SpineSpriteShaderGUI.cs @@ -680,7 +680,12 @@ public class SpineSpriteShaderGUI : ShaderGUI { if (emission && !mixedValue) { EditorGUI.BeginChangeCheck(); + +#if UNITY_2018 + _materialEditor.TexturePropertyWithHDRColor(_emissionText, _emissionMap, _emissionColor, true); +#else _materialEditor.TexturePropertyWithHDRColor(_emissionText, _emissionMap, _emissionColor, new ColorPickerHDRConfig(0, 1, 0.01010101f, 3), true); +#endif _materialEditor.FloatProperty(_emissionPower, _emissionPowerText.text); dataChanged |= EditorGUI.EndChangeCheck(); }