From: Paul Wisbey <p.wisbey@samsung.com>
Date: Thu, 20 Oct 2016 09:06:39 +0000 (-0700)
Subject: Merge "TextVisual implementation." into devel/master
X-Git-Tag: dali_1.2.11~4
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=63f9b5207c2794cdc460d587723be89585872a51

Merge "TextVisual implementation." into devel/master
---

63f9b5207c2794cdc460d587723be89585872a51
diff --cc dali-toolkit/internal/visuals/visual-base-impl.cpp
index 4156d1a,b5d5037..86d2114
--- a/dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp
@@@ -152,17 -167,7 +167,7 @@@ void Visual::Base::DoSetOffStage( Actor
    mImpl->mRenderer.Reset();
  }
  
- void Visual::Base::CreatePropertyMap( Property::Map& map ) const
- {
-   DoCreatePropertyMap( map );
- 
-   if( mImpl->mCustomShader )
-   {
-     mImpl->mCustomShader->CreatePropertyMap( map );
-   }
- }
- 
 -bool Visual::Base::GetIsOnStage() const
 +bool Visual::Base::IsOnStage() const
  {
    return mImpl->mFlags & Impl::IS_ON_STAGE;
  }