From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Mon, 17 Dec 2018 05:10:35 +0000 (+0900)
Subject: [Tizen] Prevent using an empty textureset
X-Git-Tag: accepted/tizen/unified/20181218.063015~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=ac55caa385f8660ffad8fa2898ed31f0bf73ca11;hp=a2ce70aff8324bd6ea8612c0734cb325e9771267

[Tizen] Prevent using an empty textureset

This reverts commit 91f061d2da27e2da5855fe80470cc87622228c94.

Change-Id: I07dce7016aeb9396ae5203e13be48649e17d3c59
---

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