projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6dbced3
)
[Tizen] Prevent using an empty textureset
author
Jiyun Yang
<ji.yang@samsung.com>
Mon, 14 Jan 2019 05:45:31 +0000
(14:45 +0900)
committer
Jiyun Yang
<ji.yang@samsung.com>
Mon, 14 Jan 2019 05:46:32 +0000
(14:46 +0900)
This reverts commit
7575b2d6686b9ae5424c6fbb8797ffdf9b33323a
.
dali-toolkit/internal/text/text-scroller.cpp
patch
|
blob
|
history
diff --git
a/dali-toolkit/internal/text/text-scroller.cpp
b/dali-toolkit/internal/text/text-scroller.cpp
index
4ca011e
..
ed3b0c0
100644
(file)
--- a/
dali-toolkit/internal/text/text-scroller.cpp
+++ b/
dali-toolkit/internal/text/text-scroller.cpp
@@
-274,7
+274,11
@@
void TextScroller::SetParameters( Actor scrollingTextActor, Renderer renderer, T
// Reset to the original shader and texture before scrolling
mRenderer.SetShader(mShader);
// Reset to the original shader and texture before scrolling
mRenderer.SetShader(mShader);
- mRenderer.SetTextures( mTextureSet );
+
+ if( mTextureSet )
+ {
+ mRenderer.SetTextures( mTextureSet );
+ }
}
mShader = mRenderer.GetShader();
}
mShader = mRenderer.GetShader();