Merge "Added code for stylable transitions" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / visual-base-impl.cpp

diff --git a/dali-toolkit/internal/visuals/visual-base-impl.cpp b/dali-toolkit/internal/visuals/visual-base-impl.cpp
index 86d2114..48df29a 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-base-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-impl.cpp
@@ -55,7 +55,7 @@ void Visual::Base::SetCustomShader( const Property::Map& shaderMap )
   }
   else
   {
   }
   else
   {

-   mImpl->mCustomShader = new Impl::CustomShader( shaderMap );
+    mImpl->mCustomShader = new Impl::CustomShader( shaderMap );

   }
 }
 
   }
 }
 


@@ -74,6 +74,16 @@ void Visual::Base::Initialize( Actor& actor, const Property::Map& propertyMap )
   DoInitialize( actor, propertyMap );
 }
 
   DoInitialize( actor, propertyMap );
 }
 

+void Visual::Base::SetName( const std::string& name )
+{
+  mImpl->mName = name;
+}
+
+const std::string& Visual::Base::GetName()
+{
+  return mImpl->mName;
+}
+

 void Visual::Base::SetSize( const Vector2& size )
 {
   mImpl->mSize = size;
 void Visual::Base::SetSize( const Vector2& size )
 {
   mImpl->mSize = size;