From 751476265bb596e9bbf295346e7acafa6fe0fe0f Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Sat, 27 Apr 2019 10:20:17 +0200 Subject: [PATCH] [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