Merge branch 'master' into dev

Author: Martin Pane

Assets/Tayx/Graphy - Ultimate Stats Monitor/Scripts/GraphyDebugger.cs

@@ -389,7 +389,7 @@ private void CheckDebugPackets()
                 return;
             }
 
-            for (var i = 0; i < m_debugPackets.Count; i++)
+            for (int i = 0; i < m_debugPackets.Count; i++)
             {
                 DebugPacket packet = m_debugPackets[i];
 

Assets/Tayx/Graphy - Ultimate Stats Monitor/Shaders/GraphStandard.shader

@@ -47,25 +47,32 @@
 					float4 vertex    : POSITION;
 					float4 color     : COLOR;
 					float2 texcoord  : TEXCOORD0;
+#if UNITY_2017_1_OR_NEWER
 					UNITY_VERTEX_INPUT_INSTANCE_ID
+#endif
 				};
 
 				struct v2f
 				{
 					float4 vertex    : SV_POSITION;
 					fixed4 color	 : COLOR;
 					float2 texcoord  : TEXCOORD0;
+#if UNITY_2017_1_OR_NEWER
 					UNITY_VERTEX_OUTPUT_STEREO
+#endif
 				};
 
 				fixed4 _Color;
 
 				v2f vert(appdata_t IN)
 				{
 					v2f OUT;
+
+#if UNITY_2017_1_OR_NEWER
 					UNITY_SETUP_INSTANCE_ID(IN);
 					UNITY_INITIALIZE_OUTPUT(v2f, OUT);
 					UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);
+#endif
 
 					OUT.vertex = UnityObjectToClipPos(IN.vertex);
 					OUT.texcoord = IN.texcoord;