projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated L8 text shader to account for actor alpha
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
text-atlas-renderer.cpp
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
c3663dd
..
e9b876d
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 );
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 );
}
);
}
);