Merge "Call LoadTexture() for ReleasePolicy" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / effects-view / effects-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
index 0c34673..28ecd23 100644 (file)
--- a/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
+++ b/dali-toolkit/internal/controls/effects-view/effects-view-impl.cpp
@@ -265,7 +265,7 @@ int EffectsView::GetEffectSize()
 void EffectsView::OnInitialize()
 {
   CustomActor self = Self();
-  mChildrenRoot.SetParentOrigin( ParentOrigin::CENTER );
+  mChildrenRoot.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
   self.Add( mChildrenRoot );
 }
 
@@ -283,7 +283,7 @@ void EffectsView::OnSizeSet(const Vector3& targetSize)
     Enable();
   }
 
-  mChildrenRoot.SetSize( targetSize );
+  mChildrenRoot.SetProperty( Actor::Property::SIZE, targetSize );
 
   Control::OnSizeSet( targetSize );
 }
@@ -450,7 +450,7 @@ void EffectsView::SetupCameras()
   {
     // Create a camera for the children render, corresponding to its render target size
     mCameraForChildren = CameraActor::New(mTargetSize);
-    mCameraForChildren.SetParentOrigin(ParentOrigin::CENTER);
+    mCameraForChildren.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER );
     mCameraForChildren.SetInvertYAxis( true );
     Self().Add( mCameraForChildren );
   }
@@ -462,8 +462,8 @@ void EffectsView::SetupCameras()
     mCameraForChildren.SetNearClippingPlane(1.0f);
     mCameraForChildren.SetAspectRatio(mTargetSize.width / mTargetSize.height);
     mCameraForChildren.SetType(Dali::Camera::FREE_LOOK); // camera orientation based solely on actor
-    mCameraForChildren.SetPosition(0.0f, 0.0f, mTargetSize.height * cameraPosScale);
-    mCameraForChildren.SetZ( mTargetSize.height * cameraPosScale );
+    mCameraForChildren.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, mTargetSize.height * cameraPosScale ) );
+    mCameraForChildren.SetProperty( Actor::Property::POSITION_Z,  mTargetSize.height * cameraPosScale );
   }
 }