From: Paul Wisbey <p.wisbey@samsung.com>
Date: Fri, 15 Jan 2016 11:16:48 +0000 (+0000)
Subject: Fixed regression with Actor::COLOR property in TextLabel
X-Git-Tag: dali_1.1.18~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d73cb8d5620abe0cce65941ce63ce2cf5de6690b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Fixed regression with Actor::COLOR property in TextLabel

Change-Id: I16eb72d23354af029f5e451e60e99219456663af
---

diff --git a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
index 0a90ef2..c8ea1e2 100644
--- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
+++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
@@ -48,6 +48,7 @@ void main()
 );
 
 const char* FRAGMENT_SHADER_L8 = MAKE_SHADER(
+uniform lowp    vec4      uColor;
 uniform         sampler2D sTexture;
 varying mediump vec2      vTexCoord;
 varying mediump vec4      vColor;
@@ -55,7 +56,7 @@ varying mediump vec4      vColor;
 void main()
 {
   mediump vec4 color = texture2D( sTexture, vTexCoord );
-  gl_FragColor = vec4( vColor.rgb, vColor.a * color.r );
+  gl_FragColor = vec4( vColor.rgb * uColor.rgb, vColor.a * uColor.a * color.r );
 }
 );