Merge pull request #545 from Unity-Technologies/mainmenu-runtime-shader-fix

mtschoen-unity · web-flow · commit ce79cd6c0511 · 2019-03-04T15:57:29.000-08:00
Prevent MainMenu ScrollRect elements from throwing an exception in runtime builds
diff --git a/Menus/MainMenu/Shaders/AngledVerticalGradientUIClip.shader b/Menus/MainMenu/Shaders/AngledVerticalGradientUIClip.shader
@@ -14,6 +14,9 @@
         _ColorMask("Color Mask", Float) = 15
 
         [Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip("Use Alpha Clip", Float) = 0
+
+        // Unused _MainTex property, added to prevent runtime exceptions for elements whose parent is a ScrollRect
+        [HideInInspector] _MainTex("Main Texture - unused", 2D) = "white" {}
     }
 
     SubShader

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@`
`14`	`14`	`_ColorMask("Color Mask", Float) = 15`
`15`	`15`
`16`	`16`	`[Toggle(UNITY_UI_ALPHACLIP)] _UseUIAlphaClip("Use Alpha Clip", Float) = 0`
	`17`	`+`
	`18`	`+ // Unused _MainTex property, added to prevent runtime exceptions for elements whose parent is a ScrollRect`
	`19`	`+ [HideInInspector] _MainTex("Main Texture - unused", 2D) = "white" {}`
`17`	`20`	`}`
`18`	`21`
`19`	`22`	`SubShader`