Browse Source

Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

Julian 8 years ago
parent
commit
db0d144fb9

+ 1 - 1
canvas2D/src/shaders/text2d.fragment.fx

@@ -26,7 +26,7 @@ void main(void) {
 		discard;
 		discard;
 	}
 	}
 #ifdef FontTexture
 #ifdef FontTexture
-	gl_FragColor = vec4(color.xxx*vColor*vColor.a, vColor.a);
+	gl_FragColor = vec4(color.xxx*vColor.xyz*vColor.a, vColor.a);
 #else
 #else
 	gl_FragColor = color*vColor;
 	gl_FragColor = color*vColor;
 #endif
 #endif

File diff suppressed because it is too large
+ 1 - 1
dist/preview release/canvas2D/babylon.canvas2d.js


File diff suppressed because it is too large
+ 2 - 2
dist/preview release/canvas2D/babylon.canvas2d.min.js