Merge "Support animation of Visual transform properties" into devel/master

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

diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.h b/dali-toolkit/internal/visuals/visual-base-data-impl.h
index 23bcda9..718b5e4 100644 (file)
--- a/dali-toolkit/internal/visuals/visual-base-data-impl.h
+++ b/dali-toolkit/internal/visuals/visual-base-data-impl.h
@@ -57,7 +57,7 @@ struct Base::Impl
 
   enum Flags
   {
-    IS_ON_STAGE = 1,
+    IS_ON_SCENE = 1,
     IS_ATLASING_APPLIED = 1<<1,
     IS_PREMULTIPLIED_ALPHA = 1 << 2,
     IS_SYNCHRONOUS_RESOURCE_LOADING = 1 << 3
@@ -116,11 +116,12 @@ struct Base::Impl
     Vector4 mOffsetSizeMode;
     Toolkit::Align::Type mOrigin;
     Toolkit::Align::Type mAnchorPoint;
+    Property::Index      mOffsetIndex;
+    Property::Index      mSizeIndex;
   };
 
   Renderer        mRenderer;
   CustomShader*   mCustomShader;
-  SlotDelegate<Visual::Base>* mBlendSlotDelegate; ///< Used to own mix color animation connection
   EventObserver*  mEventObserver;  ///< Allows controls to observe when the visual has events to notify
   std::string     mName;
   Transform       mTransform;
@@ -135,6 +136,7 @@ struct Base::Impl
   int             mFlags;
   Toolkit::Visual::ResourceStatus  mResourceStatus;
   const Toolkit::Visual::Type      mType;
+  bool                             mNeedCornerRadius;
 };
 
 } // namespace Visual