From: Joogab Yun <joogab.yun@samsung.com>
Date: Wed, 28 Nov 2018 05:22:21 +0000 (+0900)
Subject: Revert "[Tizen] Prevent using an empty textureset"
X-Git-Tag: submit/tizen/20181128.063102~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=0a61ff681b3f611f9874dbd77e8b51fbc3e74377;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Revert "[Tizen] Prevent using an empty textureset"

This reverts commit 3f0892842a7caf6460ed3b8ac3d29d9c45dbb2cc.
---

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