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

[Tizen] Prevent using an empty textureset

This reverts commit 05eba8d3a8aeb4d0dcd1f5d16cf2cee82533eb97.

Change-Id: I72a1e8aa7758d6bbcb336cc7b56851cdb6931984
---

diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp
index 4ca011e..ed3b0c0 100644
--- a/dali-toolkit/internal/text/text-scroller.cpp
+++ b/dali-toolkit/internal/text/text-scroller.cpp
@@ -274,7 +274,11 @@ void TextScroller::SetParameters( Actor scrollingTextActor, Renderer renderer, T
 
     // Reset to the original shader and texture before scrolling
     mRenderer.SetShader(mShader);
-    mRenderer.SetTextures( mTextureSet );
+
+    if( mTextureSet )
+    {
+      mRenderer.SetTextures( mTextureSet );
+    }
   }
 
   mShader = mRenderer.GetShader();