Merge "[Tizen] Remove unreached code in CanvasRenderer::Drawable" into tizen

diff --git a/dali/internal/canvas-renderer/tizen/drawable-impl-tizen.cpp b/dali/internal/canvas-renderer/tizen/drawable-impl-tizen.cpp
index 1d39c44..464d535 100644 (file)
--- a/dali/internal/canvas-renderer/tizen/drawable-impl-tizen.cpp
+++ b/dali/internal/canvas-renderer/tizen/drawable-impl-tizen.cpp
@@ -172,10 +172,6 @@ void DrawableTizen::SetObject(const void* object)
   if(object)
   {
     mTvgPaint = static_cast<tvg::Paint*>((void*)object);
-    if(!mTvgPaint)
-    {
-      DALI_LOG_ERROR("Drawable is invalid [%p]\n", this);
-    }
   }
   else
   {

diff --git a/dali/internal/canvas-renderer/ubuntu/drawable-impl-ubuntu.cpp b/dali/internal/canvas-renderer/ubuntu/drawable-impl-ubuntu.cpp
index ad37934..cc3de91 100644 (file)
--- a/dali/internal/canvas-renderer/ubuntu/drawable-impl-ubuntu.cpp
+++ b/dali/internal/canvas-renderer/ubuntu/drawable-impl-ubuntu.cpp
@@ -206,10 +206,6 @@ void DrawableUbuntu::SetObject(const void* object)
   if(object)
   {
     mTvgPaint = static_cast<tvg::Paint*>((void*)object);
-    if(!mTvgPaint)
-    {
-      DALI_LOG_ERROR("Drawable is invalid [%p]\n", this);
-    }
   }
   else
   {