X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-data-impl.cpp;h=16044b7c9511ba3d8657e184f1dce713738be855;hp=f8d3e5fb49e72263377553bfa3eb2d26a4598ec1;hb=fb0339fee98523cbf3e527ddd8125660aa441c6c;hpb=25a777fa03f29f6ac64adedac1f88674f0575115

diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
index f8d3e5f..16044b7 100644
--- a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
+++ b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
@@ -83,9 +83,12 @@ Dali::Vector2 PointToVector2( Toolkit::Align::Type point, Toolkit::Direction::Ty
 
 Internal::Visual::Base::Impl::Impl()
 : mCustomShader( NULL ),
+  mBlendSlotDelegate( NULL ),
   mTransform(),
+  mMixColor( Color::WHITE ),
   mControlSize( Vector2::ZERO ),
   mDepthIndex( 0.0f ),
+  mMixColorIndex( Property::INVALID_INDEX ),
   mFlags( 0 )
 {
 }
@@ -93,6 +96,7 @@ Internal::Visual::Base::Impl::Impl()
 Internal::Visual::Base::Impl::~Impl()
 {
   delete mCustomShader;
+  delete mBlendSlotDelegate;
 }
 
 Internal::Visual::Base::Impl::CustomShader::CustomShader( const Property::Map& map )
@@ -215,6 +219,11 @@ void Internal::Visual::Base::Impl::Transform::SetPropertyMap( const Property::Ma
   mOrigin = Toolkit::Align::CENTER;
   mAnchorPoint = Toolkit::Align::CENTER;
 
+  UpdatePropertyMap( map );
+}
+
+void Internal::Visual::Base::Impl::Transform::UpdatePropertyMap( const Property::Map& map )
+{
   for( Property::Map::SizeType i(0); i<map.Count(); ++i )
   {
     KeyValuePair keyValue = map.GetKeyValue( i );