From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Mon, 5 Nov 2018 08:20:01 +0000 (+0900)
Subject: Revert "[Tizen] Prevent using an empty textureset"
X-Git-Tag: submit/tizen_5.0/20181105.085521~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be63b5f23fb1c1a58a45cb2e88374dca1094d297;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Revert "[Tizen] Prevent using an empty textureset"

This reverts commit d7f86f89bee616ddd77e5fa2f5e88278686a44b2.
---

diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp
index ed3b0c0061..4ca011e966 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();