From: joogab yun <joogab.yun@samsung.com>
Date: Fri, 18 Sep 2020 04:48:30 +0000 (+0000)
Subject: Merge "Add null check for mTextureSet. For empty text, text-visual doesn't create... 
X-Git-Tag: dali_1.9.31~6
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=c7f57d1d83deccfeb8c96f6f3c583f8e155e878b;hp=74f25e93f1094929c90c1632b686e9bfa03bd017

Merge "Add null check for mTextureSet. For empty text, text-visual doesn't create a textureSet. So it happens that mTextureSet is null." into devel/master
---

diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp
old mode 100644
new mode 100755
index 22f1156..6d0930b
--- a/dali-toolkit/internal/text/text-scroller.cpp
+++ b/dali-toolkit/internal/text/text-scroller.cpp
@@ -271,7 +271,10 @@ 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();