From: Jiyun Yang <ji.yang@samsung.com>
Date: Mon, 14 Jan 2019 05:44:01 +0000 (+0900)
Subject: Revert "[Tizen] Prevent using an empty textureset"
X-Git-Tag: submit/tizen/20190114.061957~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=7575b2d6686b9ae5424c6fbb8797ffdf9b33323a

Revert "[Tizen] Prevent using an empty textureset"

This reverts commit e074009fc7d7d012470b36880506de80e21bc763.
---

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