summaryrefslogtreecommitdiff
path: root/drivers/gles2
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-04-02 12:59:23 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-04-02 12:59:23 -0300
commit68e42f53badd6a501021e545c09b2c41ad21e1e0 (patch)
tree11947092ec325e1970a468c91eaf9bb539d37e59 /drivers/gles2
parent1572238adb5b68e18cf20ec73b2f437736e21152 (diff)
Beta1 Attempt #1
-=-==-=-=-=-=-=- -Small fixes in canvas item light shader -Fixed compilation in server target -Export for Android makes 32 bits display as default -changed version to 1.1beta1
Diffstat (limited to 'drivers/gles2')
-rw-r--r--drivers/gles2/shaders/canvas.glsl2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gles2/shaders/canvas.glsl b/drivers/gles2/shaders/canvas.glsl
index 12ff43479b..baa7e664b5 100644
--- a/drivers/gles2/shaders/canvas.glsl
+++ b/drivers/gles2/shaders/canvas.glsl
@@ -235,7 +235,7 @@ FRAGMENT_SHADER_CODE
#if defined(USE_LIGHT_SHADER_CODE)
//light is written by the light shader
{
- vec4 light_out=vec4(0.0,0.0,0.0,0.0);
+ vec4 light_out=light*color;
LIGHT_SHADER_CODE
color=light_out;
}