Merge branch 'dev' of github.com:UnityTech/UIWidgets into computebuffer

zhuxingwei · zhuxingwei · commit 7a327f58931a · 2019-08-14T16:00:32.000+08:00
diff --git a/Runtime/Resources/shaders/UIWidgets_canvas.cginc b/Runtime/Resources/shaders/UIWidgets_canvas.cginc
@@ -185,5 +185,5 @@ float strokeMask(float u, float v) {
 }
 
 fixed4 frag_stroke_alpha(v2f i) : SV_Target {
-    return shader_color(i) * strokeMask(i.ftcoord.x, i.ftcoord.y);
+    return prealpha(shader_color(i)) * strokeMask(i.ftcoord.x, i.ftcoord.y);
 }

Original file line number	Diff line number	Diff line change
`@@ -185,5 +185,5 @@ float strokeMask(float u, float v) {`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`fixed4 frag_stroke_alpha(v2f i) : SV_Target {`
`188`		`- return shader_color(i) * strokeMask(i.ftcoord.x, i.ftcoord.y);`
	`188`	`+ return prealpha(shader_color(i)) * strokeMask(i.ftcoord.x, i.ftcoord.y);`
`189`	`189`	`}`