From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Mon, 14 Aug 2017 06:15:56 +0000 (+0900)
Subject: Revert "[Tizen] Updated L8 text shader to account for actor alpha"
X-Git-Tag: submit/tizen/20170814.093340~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64b73b29f5f3ae20bd6cb7f8024b6d3687a7ce60;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Revert "[Tizen] Updated L8 text shader to account for actor alpha"

This reverts commit 72a6d1a87f205ffa99e8b25b96af254a7f8654ad.

Change-Id: I0773b259d824c0b615af8250d2363948f7983a1b
---

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 e9b876d..c3663dd 100644
--- 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, uColor.a * vColor.a * textColorAnimatable.a * color.r );
+  gl_FragColor = vec4( vColor.rgb * uColor.rgb * textColorAnimatable.rgb, vColor.a * textColorAnimatable.a * color.r );
 }
 );