From: Heeyong Song <heeyong.song@samsung.com>
Date: Mon, 3 Dec 2018 05:55:17 +0000 (+0900)
Subject: Revert "[Tizen] Prevent using an empty textureset"
X-Git-Tag: submit/tizen/20181203.071134~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e401a3427fd3ee25e64cc5e242222d82edaec45d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Revert "[Tizen] Prevent using an empty textureset"

This reverts commit 15a57db0d88ac2015c6f7489eeef6a2d6482df5d.

Change-Id: I271e8c9693d25880f0058de7b648d1e3a04f393f
---

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