From fa04b45ad02ba0f85c8030387774d83a2cd5882b Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Tue, 13 Feb 2018 10:34:14 +0900 Subject: [PATCH] [4.0] Prevent using an empty textureset Change-Id: Id47720179996ff3107bb506ea873f50b254ff895 --- dali-toolkit/internal/text/text-scroller.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp index 2710d3a..0e3af00 100644 --- a/dali-toolkit/internal/text/text-scroller.cpp +++ b/dali-toolkit/internal/text/text-scroller.cpp @@ -282,7 +282,11 @@ void TextScroller::SetParameters( Actor scrollingTextActor, Renderer renderer, T // Reset to the original shader and texture before scrolling mRenderer.SetShader(mShader); - mRenderer.SetTextures( mTextureSet ); + + if( mTextureSet ) + { + mRenderer.SetTextures( mTextureSet ); + } } mShader = mRenderer.GetShader(); -- 2.7.4