浏览代码

[unity] Prevented a warning to appear in Unity 2017.3 and newer. Code auto-update previously caused mixed line endings.

Harald Csaszar 6 年之前
父节点
当前提交
f53ce3734c

+ 4 - 0
spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Sprite/CGIncludes/ShaderShared.cginc

@@ -5,7 +5,11 @@
 
 
 #ifdef UNITY_INSTANCING_ENABLED
 #ifdef UNITY_INSTANCING_ENABLED
 
 
+#if UNITY_2017_3_OR_NEWER
+	UNITY_INSTANCING_BUFFER_START(PerDrawSprite)
+#else
     UNITY_INSTANCING_CBUFFER_START(PerDrawSprite)
     UNITY_INSTANCING_CBUFFER_START(PerDrawSprite)
+#endif
         // SpriteRenderer.Color while Non-Batched/Instanced.
         // SpriteRenderer.Color while Non-Batched/Instanced.
         fixed4 unity_SpriteRendererColorArray[UNITY_INSTANCED_ARRAY_SIZE];
         fixed4 unity_SpriteRendererColorArray[UNITY_INSTANCED_ARRAY_SIZE];
         // this could be smaller but that's how bit each entry is regardless of type
         // this could be smaller but that's how bit each entry is regardless of type