diff options
author | Juan Linietsky <reduzio@gmail.com> | 2014-05-24 01:35:47 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2014-05-24 01:35:47 -0300 |
commit | 1cad087969efefa401a11051343cd0689f660770 (patch) | |
tree | 1595dd049bdb7289752012dca4398b2251fb08fa /drivers/gles2/shaders | |
parent | f9ff086235cd4ff406b136f62fff77b85c0873f9 (diff) |
Making Godot Easier to Use..
-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-Auto indenter in code editor, this makes it much easier to paste external code.
-Zoom in 2D viewport now uses the mouse pointer as reference.
-Obscure hack to see where code/line of GDScript in C++ backtrace.
-Fixed a bug where keys would get stuck on X11 if pressed simultaneously
-Added Api on IP singleton to request local IPs.
-Premultiplied alpha support when importing texture, editing PNGs and as a blend mode.
Diffstat (limited to 'drivers/gles2/shaders')
-rw-r--r-- | drivers/gles2/shaders/canvas.glsl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gles2/shaders/canvas.glsl b/drivers/gles2/shaders/canvas.glsl index 66bdf15db4..f36741d586 100644 --- a/drivers/gles2/shaders/canvas.glsl +++ b/drivers/gles2/shaders/canvas.glsl @@ -64,6 +64,9 @@ void main() { highp float enc32 = dot( color,highp vec4(1.0 / (256.0 * 256.0 * 256.0),1.0 / (256.0 * 256.0),1.0 / 256.0,1) ); color = vec4(vec3(enc32),1.0); #endif + +// color.rgb*=color.a; gl_FragColor = color; + } |