From 0a61ff681b3f611f9874dbd77e8b51fbc3e74377 Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Wed, 28 Nov 2018 14:22:21 +0900 Subject: [PATCH] Revert "[Tizen] Prevent using an empty textureset" This reverts commit 3f0892842a7caf6460ed3b8ac3d29d9c45dbb2cc. --- dali-toolkit/internal/text/text-scroller.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp index ed3b0c0..4ca011e 100644 --- a/dali-toolkit/internal/text/text-scroller.cpp +++ b/dali-toolkit/internal/text/text-scroller.cpp @@ -274,11 +274,7 @@ void TextScroller::SetParameters( Actor scrollingTextActor, Renderer renderer, T // Reset to the original shader and texture before scrolling mRenderer.SetShader(mShader); - - if( mTextureSet ) - { - mRenderer.SetTextures( mTextureSet ); - } + mRenderer.SetTextures( mTextureSet ); } mShader = mRenderer.GetShader(); -- 2.7.4