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
Revert "[Tizen] Prevent using an empty textureset"
[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
ed3b0c0
..
4ca011e
100644
(file)
--- a/
dali-toolkit/internal/text/text-scroller.cpp
+++ b/
dali-toolkit/internal/text/text-scroller.cpp
@@
-274,11
+274,7
@@
void TextScroller::SetParameters( Actor scrollingTextActor, Renderer renderer, T
// Reset to the original shader and texture before scrolling
mRenderer.SetShader(mShader);
-
- if( mTextureSet )
- {
- mRenderer.SetTextures( mTextureSet );
- }
+ mRenderer.SetTextures( mTextureSet );
}
mShader = mRenderer.GetShader();