From e074009fc7d7d012470b36880506de80e21bc763 Mon Sep 17 00:00:00 2001 From: Sunghyun kim Date: Wed, 2 Jan 2019 10:56:49 +0900 Subject: [PATCH] [Tizen] Prevent using an empty textureset This reverts commit 05eba8d3a8aeb4d0dcd1f5d16cf2cee82533eb97. Change-Id: I72a1e8aa7758d6bbcb336cc7b56851cdb6931984 --- 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 4ca011e..ed3b0c0 100644 --- 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); - mRenderer.SetTextures( mTextureSet ); + + if( mTextureSet ) + { + mRenderer.SetTextures( mTextureSet ); + } } mShader = mRenderer.GetShader(); -- 2.7.4