From ac55caa385f8660ffad8fa2898ed31f0bf73ca11 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Mon, 17 Dec 2018 14:10:35 +0900 Subject: [PATCH] [Tizen] Prevent using an empty textureset This reverts commit 91f061d2da27e2da5855fe80470cc87622228c94. Change-Id: I07dce7016aeb9396ae5203e13be48649e17d3c59 --- 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