From: Sunghyun Kim <scholb.kim@samsung.com>
Date: Wed, 23 Sep 2020 02:21:07 +0000 (+0900)
Subject: Revert "[Tizen] Add null check for mTextureSet."
X-Git-Tag: accepted/tizen/unified/20200924.072514~8
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=86acab0180d9009540098a96f960193d6a0164d9

Revert "[Tizen] Add null check for mTextureSet."

This reverts commit dcd9007d49dac8cc4c4a8f3d2ea5a0a5bea3fa6a.

Change-Id: I3c69f9f3f8605dc0015d9c89e897ba0dd607ceca
---

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();