From ee3655f4d3fea0eb0894023fc037eb3df080471a Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Mon, 22 Apr 2019 22:09:23 +0200 Subject: [PATCH 1/6] [unity] Removed 2 of 3 warnings in Unity 2019.1. See #1336. --- .../Modules/Shaders/Sprite/Editor/SpineSpriteShaderGUI.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders/Sprite/Editor/SpineSpriteShaderGUI.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders/Sprite/Editor/SpineSpriteShaderGUI.cs index c51eda11d..5a3f7e05a 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders/Sprite/Editor/SpineSpriteShaderGUI.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Modules/Shaders/Sprite/Editor/SpineSpriteShaderGUI.cs @@ -681,7 +681,7 @@ public class SpineSpriteShaderGUI : ShaderGUI { if (emission && !mixedValue) { EditorGUI.BeginChangeCheck(); -#if UNITY_2018 +#if UNITY_2018_1_OR_NEWER _materialEditor.TexturePropertyWithHDRColor(_emissionText, _emissionMap, _emissionColor, true); #else _materialEditor.TexturePropertyWithHDRColor(_emissionText, _emissionMap, _emissionColor, new ColorPickerHDRConfig(0, 1, 0.01010101f, 3), true); From 58e495ecae356ed8abfeb74988faf43a24bb61f7 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Thu, 25 Apr 2019 16:35:11 +0200 Subject: [PATCH 2/6] [unity] Fixed unnecessary updates in editor when SkeletonRenderer is selected. Closes #1339. --- .../Spine/Editor/spine-unity/Editor/SpineMaskUtilities.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineMaskUtilities.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineMaskUtilities.cs index 0986fedf8..820882120 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineMaskUtilities.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineMaskUtilities.cs @@ -90,10 +90,7 @@ namespace Spine.Unity.Editor { var maskMaterials = skeleton.maskMaterials; var maskInteraction = skeleton.maskInteraction; - if (maskInteraction == SpriteMaskInteraction.None) { - return (maskMaterials.materialsMaskDisabled.Length == 0 || maskMaterials.materialsMaskDisabled[0] == null); - } - else if (maskInteraction == SpriteMaskInteraction.VisibleInsideMask) { + if (maskInteraction == SpriteMaskInteraction.VisibleInsideMask) { return (maskMaterials.materialsInsideMask.Length == 0 || maskMaterials.materialsInsideMask[0] == null); } else if (maskInteraction == SpriteMaskInteraction.VisibleOutsideMask) { From 751476265bb596e9bbf295346e7acafa6fe0fe0f Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Sat, 27 Apr 2019 10:20:17 +0200 Subject: [PATCH 3/6] [unity] Prevented a warning to appear in Unity 2017.3 and newer. Code auto-update previously caused mixed line endings. --- .../Modules/Shaders/Sprite/CGIncludes/ShaderShared.cginc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Sprite/CGIncludes/ShaderShared.cginc b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Sprite/CGIncludes/ShaderShared.cginc index 70cc49eed..2481b3d4a 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Sprite/CGIncludes/ShaderShared.cginc +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Sprite/CGIncludes/ShaderShared.cginc @@ -5,7 +5,11 @@ #ifdef UNITY_INSTANCING_ENABLED +#if UNITY_2017_3_OR_NEWER + UNITY_INSTANCING_BUFFER_START(PerDrawSprite) +#else UNITY_INSTANCING_CBUFFER_START(PerDrawSprite) +#endif // SpriteRenderer.Color while Non-Batched/Instanced. fixed4 unity_SpriteRendererColorArray[UNITY_INSTANCED_ARRAY_SIZE]; // this could be smaller but that's how bit each entry is regardless of type From c8594a66c4828d726dcccd0a58b7bab3fa10cdbb Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Sat, 27 Apr 2019 11:54:19 +0200 Subject: [PATCH 4/6] [unity] Reverting last commit changes again since Unity's auto code updater still causes mixed line endings on Unity 2019 due to ignoring #if branches in shaders. Will be changed in gitattributes instead to change cginc to lf. --- .../Modules/Shaders/Sprite/CGIncludes/ShaderShared.cginc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Sprite/CGIncludes/ShaderShared.cginc b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Sprite/CGIncludes/ShaderShared.cginc index 2481b3d4a..70cc49eed 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Sprite/CGIncludes/ShaderShared.cginc +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Sprite/CGIncludes/ShaderShared.cginc @@ -5,11 +5,7 @@ #ifdef UNITY_INSTANCING_ENABLED -#if UNITY_2017_3_OR_NEWER - UNITY_INSTANCING_BUFFER_START(PerDrawSprite) -#else UNITY_INSTANCING_CBUFFER_START(PerDrawSprite) -#endif // SpriteRenderer.Color while Non-Batched/Instanced. fixed4 unity_SpriteRendererColorArray[UNITY_INSTANCED_ARRAY_SIZE]; // this could be smaller but that's how bit each entry is regardless of type From 533203bf32634be41f033e873636d81a7183d80a Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Sat, 27 Apr 2019 14:15:10 +0200 Subject: [PATCH 5/6] gitattributes: set .cginc and .shader files to lf line endings to prevent Unity code auto-updater to create mixed line endings. --- .gitattributes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitattributes b/.gitattributes index 51e4fb69c..c258040ae 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,3 +15,7 @@ *.asset merge=unityyamlmerge text eol=lf *.meta merge=unityyamlmerge text eol=lf *.controller merge=unityyamlmerge text eol=lf + +# Prevent mixed line ending warnings created by Unity's code auto-updater +*.cginc text eol=lf +*.shader text eol=lf From cd703b38cfcc12c5ecf3a390438db3948a25b8f4 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Mon, 29 Apr 2019 17:52:23 +0200 Subject: [PATCH 6/6] [unity] Fixed casting exception when use custom atlas asset. Closes #1342. --- .../Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 df99008a4..5d94918cf 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs @@ -1362,9 +1362,9 @@ namespace Spine.Unity.Editor { bool pmaVertexColors = false; bool tintBlack = false; - foreach (SpineAtlasAsset atlasAsset in skeletonDataAsset.atlasAssets) { + foreach (AtlasAssetBase atlasAsset in skeletonDataAsset.atlasAssets) { if (!pmaVertexColors) { - foreach (Material m in atlasAsset.materials) { + foreach (Material m in atlasAsset.Materials) { if (m.shader.name.Contains(PMAShaderQuery)) { pmaVertexColors = true; break; @@ -1373,7 +1373,7 @@ namespace Spine.Unity.Editor { } if (!tintBlack) { - foreach (Material m in atlasAsset.materials) { + foreach (Material m in atlasAsset.Materials) { if (m.shader.name.Contains(TintBlackShaderQuery)) { tintBlack = true; break;