Merge pull request #23339 from RandomShaper/fix-gles2-canvas-inconsistency

Fix GLES2 automatic texture lookup in canvas
2018-10-29 10:16:28 +01:00
parent 019760d611 11815a23dc
commit eb20d9055d
1 changed files with 3 additions and 0 deletions
@@ -148,7 +148,10 @@ void main() {

 	vec4 color = color_interp;

+#if !defined(COLOR_USED)
+	//default behavior, texture by color
 	color *= texture2D(color_texture, uv_interp);
+#endif

 #ifdef SCREEN_UV_USED
 	vec2 screen_uv = gl_FragCoord.xy * screen_pixel_size;