From 967be75ca1967c7878470382c5537e0da57431ca Mon Sep 17 00:00:00 2001 From: Sunghyun kim Date: Tue, 13 Nov 2018 15:30:17 +0900 Subject: [PATCH] [Tizen] Prevent using an empty textureset This reverts commit fa6b6fd95e2916fd7f6ed2f016da51a0994440b5. Change-Id: Ie485e6893582af111f29693ea8a1b0e70994daed --- 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