From 86acab0180d9009540098a96f960193d6a0164d9 Mon Sep 17 00:00:00 2001 From: Sunghyun Kim Date: Wed, 23 Sep 2020 11:21:07 +0900 Subject: [PATCH] Revert "[Tizen] Add null check for mTextureSet." This reverts commit dcd9007d49dac8cc4c4a8f3d2ea5a0a5bea3fa6a. Change-Id: I3c69f9f3f8605dc0015d9c89e897ba0dd607ceca --- dali-toolkit/internal/text/text-scroller.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) mode change 100755 => 100644 dali-toolkit/internal/text/text-scroller.cpp diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp old mode 100755 new mode 100644 index b2c1b19..c0c1558 --- a/dali-toolkit/internal/text/text-scroller.cpp +++ b/dali-toolkit/internal/text/text-scroller.cpp @@ -271,10 +271,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