From: Victor Cebollada <v.cebollada@samsung.com>
Date: Sat, 20 Sep 2014 08:52:59 +0000 (+0100)
Subject: TextRenderer - Return from DoRender if the texture is null
X-Git-Tag: accepted/tizen/common/20140925.172112~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa843b711dcd18e06473ef2a6e348cbeef4728e4;hp=85d46d0f8d7903b30c3138310cf3f8e172d5a247;p=platform%2Fcore%2Fuifw%2Fdali-core.git

TextRenderer - Return from DoRender if the texture is null

Avoid TextRenderer::DoRender to assert if the texture is null.

Change-Id: Idcd0b913d66341874c44acf725f9cb0969d10149
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
---

diff --git a/dali/internal/render/renderers/scene-graph-text-renderer.cpp b/dali/internal/render/renderers/scene-graph-text-renderer.cpp
index 1c2a857..f3ec12e 100644
--- a/dali/internal/render/renderers/scene-graph-text-renderer.cpp
+++ b/dali/internal/render/renderers/scene-graph-text-renderer.cpp
@@ -350,6 +350,11 @@ bool TextRenderer::IsOutsideClipSpace( const Matrix& modelMatrix, const Matrix&
 void TextRenderer::DoRender( BufferIndex bufferIndex, Program& program, const Matrix& modelViewMatrix, const Matrix& viewMatrix )
 {
   DALI_ASSERT_DEBUG( NULL != mTexture && "TextRenderer::DoRender. mTexture == NULL." );
+  if( NULL == mTexture )
+  {
+    // Nothing to render.
+    return;
+  }
 
   DALI_LOG_INFO( gTextFilter, Debug::General, "TextRenderer::DoRender(this: %p) textureId:%d\n", this, mTextureId );