From: Seungho, Baek Date: Mon, 10 Dec 2018 04:53:49 +0000 (+0900) Subject: [Tizen] Prevent using an empty textureset X-Git-Tag: accepted/tizen/unified/20181212.062445~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f79d3201d1d216673022a3ee5e43c00a967f21fa;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git [Tizen] Prevent using an empty textureset This reverts commit ba8f07974683c787119389ab3e6e26458c92cce4. --- 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();