UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 09:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Handle obsolete APIs in 2018.1

Browse Source
This commit is contained in:
pharan 2018-05-13 03:19:03 +08:00
parent 8ee47b2f5a
commit debc5801c8
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs
View File

@ -487,11 +487,19 @@ namespace Spine.Unity.Editor {
skeletonUtilityBoneTable.Clear(); skeletonUtilityBoneTable.Clear();
boundingBoxFollowerTable.Clear(); boundingBoxFollowerTable.Clear();
#if UNITY_2018
EditorApplication.hierarchyChanged -= HierarchyIconsOnChanged;
#else
EditorApplication.hierarchyWindowChanged -= HierarchyIconsOnChanged; EditorApplication.hierarchyWindowChanged -= HierarchyIconsOnChanged;
#endif
EditorApplication.hierarchyWindowItemOnGUI -= HierarchyIconsOnGUI; EditorApplication.hierarchyWindowItemOnGUI -= HierarchyIconsOnGUI;
if (!Application.isPlaying && showHierarchyIcons) { if (!Application.isPlaying && showHierarchyIcons) {
#if UNITY_2018
EditorApplication.hierarchyChanged += HierarchyIconsOnChanged;
#else
EditorApplication.hierarchyWindowChanged += HierarchyIconsOnChanged; EditorApplication.hierarchyWindowChanged += HierarchyIconsOnChanged;
#endif
EditorApplication.hierarchyWindowItemOnGUI += HierarchyIconsOnGUI; EditorApplication.hierarchyWindowItemOnGUI += HierarchyIconsOnGUI;
HierarchyIconsOnChanged(); HierarchyIconsOnChanged();
} }

5
spine-unity/Assets/spine-unity/Modules/Shaders/Sprite/Editor/SpineSpriteShaderGUI.cs
View File

@ -680,7 +680,12 @@ public class SpineSpriteShaderGUI : ShaderGUI {
if (emission && !mixedValue) { if (emission && !mixedValue) {
EditorGUI.BeginChangeCheck(); 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); _materialEditor.TexturePropertyWithHDRColor(_emissionText, _emissionMap, _emissionColor, new ColorPickerHDRConfig(0, 1, 0.01010101f, 3), true);
#endif
_materialEditor.FloatProperty(_emissionPower, _emissionPowerText.text); _materialEditor.FloatProperty(_emissionPower, _emissionPowerText.text);
dataChanged |= EditorGUI.EndChangeCheck(); dataChanged |= EditorGUI.EndChangeCheck();
} }