Updated L8 text shader to account for actor alpha

Fading demos such as popup and contact view were showing text too early / too late.
This patch fixes these demos.

Change-Id: I54aa32311ca27f9169f7b196d45a111ef0965f95
Signed-off-by: David Steele <david.steele@samsung.com>

diff --git a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
index c3663dd3ddc329b1d8d022dc375f5ad725d4b831..e9b876da8b128e9dd586f210a2dde7250299b02d 100644 (file)
--- a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
+++ b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp
@@ -73,7 +73,7 @@ varying mediump vec4      vColor;
 void main()
 {
   mediump vec4 color = texture2D( sTexture, vTexCoord );
-  gl_FragColor = vec4( vColor.rgb * uColor.rgb * textColorAnimatable.rgb, vColor.a * textColorAnimatable.a * color.r );
+  gl_FragColor = vec4( vColor.rgb * uColor.rgb * textColorAnimatable.rgb, uColor.a * vColor.a * textColorAnimatable.a * color.r );
 }
 );