From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Mon, 5 Nov 2018 08:27:48 +0000 (+0900)
Subject: [Tizen] Prevent using an empty textureset
X-Git-Tag: accepted/tizen/5.0/unified/20181106.070355~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=455c520785fc5ff36f2f623ecef434f98a4858f7;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

[Tizen] Prevent using an empty textureset

This reverts commit be63b5f23fb1c1a58a45cb2e88374dca1094d297.

Change-Id: Icc3a5671d1ecf7dad8cc64c3a8c4491e9885db11
---

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