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
Fix typo
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-scroller.cpp
diff --git
a/dali-toolkit/internal/text/text-scroller.cpp
b/dali-toolkit/internal/text/text-scroller.cpp
index
f421cf7
..
e6da930
100644
(file)
--- a/
dali-toolkit/internal/text/text-scroller.cpp
+++ b/
dali-toolkit/internal/text/text-scroller.cpp
@@
-88,7
+88,6
@@
const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
discard;\n
\n
mediump vec4 textTexture = texture2D( sTexture, vTexCoord );\n
discard;\n
\n
mediump vec4 textTexture = texture2D( sTexture, vTexCoord );\n
- textTexture.rgb *= mix( 1.0, textTexture.a, preMultipliedAlpha );\n
\n
gl_FragColor = textTexture * uColor * vec4( mixColor, 1.0 );
}\n
\n
gl_FragColor = textTexture * uColor * vec4( mixColor, 1.0 );
}\n