From: Heeyong Song <heeyong.song@samsung.com>
Date: Mon, 21 Jan 2019 07:13:30 +0000 (+0900)
Subject: Revert "[Tizen] Prevent using an empty textureset"
X-Git-Tag: accepted/tizen/unified/20190128.061401~3
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=09562c632de026e9c7f2fa031bf5d41559b152b7

Revert "[Tizen] Prevent using an empty textureset"

This reverts commit 8b8dce7461bc5cec89a47d60b2a72880bfb13514.

Change-Id: I6758e1e604a0f846ae9223421cee37b9de0919ad
---

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