From c8594a66c4828d726dcccd0a58b7bab3fa10cdbb Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Sat, 27 Apr 2019 11:54:19 +0200 Subject: [PATCH] [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