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

[Tizen] Prevent using an empty textureset

This reverts commit 0a61ff681b3f611f9874dbd77e8b51fbc3e74377.

Change-Id: I951de6610384654e36a80d6e05cddc9b13eefb56
---

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