From: Sunghyun kim <scholb.kim@samsung.com>
Date: Wed, 2 Jan 2019 01:53:54 +0000 (+0900)
Subject: Revert "[Tizen] Prevent using an empty textureset"
X-Git-Tag: accepted/tizen/unified/20190102.092236~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=05eba8d3a8aeb4d0dcd1f5d16cf2cee82533eb97;hp=a6e1c2632c65fb0642a54f18dbd54e9aa673d4b7

Revert "[Tizen] Prevent using an empty textureset"

This reverts commit ac55caa385f8660ffad8fa2898ed31f0bf73ca11.

Change-Id: I7fe261e5f423ac0c6dc01d6870d75110ee8a6f3a
---

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