From 05eba8d3a8aeb4d0dcd1f5d16cf2cee82533eb97 Mon Sep 17 00:00:00 2001 From: Sunghyun kim Date: Wed, 2 Jan 2019 10:53:54 +0900 Subject: [PATCH] Revert "[Tizen] Prevent using an empty textureset" This reverts commit ac55caa385f8660ffad8fa2898ed31f0bf73ca11. Change-Id: I7fe261e5f423ac0c6dc01d6870d75110ee8a6f3a --- 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