X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fbuilder-animations.cpp;h=ddf2cdaf01ae3a915d58b80274d9518e8bc8ec1a;hb=678abc1612bf792741f9018c0cb5210738b61113;hp=6caf3925c91af84f712e80944eae5956d1b8ddf6;hpb=620ac79821b89142af1926f3577c7fa003f16ad3;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/builder/builder-animations.cpp b/dali-toolkit/internal/builder/builder-animations.cpp index 6caf392..ddf2cda 100644 --- a/dali-toolkit/internal/builder/builder-animations.cpp +++ b/dali-toolkit/internal/builder/builder-animations.cpp @@ -17,7 +17,7 @@ // EXTERNAL INCLUDES #include -#include +#include #include // INTERNAL INCLUDES @@ -134,7 +134,7 @@ AlphaFunction GetAlphaFunction( const std::string& alphaFunction ) } else { - DALI_ASSERT_ALWAYS( iter != alphaFunctionLut.end() && "Unknown Anchor Constant" ); + DALI_ASSERT_ALWAYS( iter != alphaFunctionLut.end() && "Unknown Alpha Constant" ); return Dali::AlphaFunction::DEFAULT; } } @@ -229,13 +229,13 @@ Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D // to allow animating shader uniforms if( propIndex == Property::INVALID_INDEX ) { - RenderableActor renderable = RenderableActor::DownCast( targetHandle ); - if( renderable ) + ImageActor imageActor = ImageActor::DownCast( targetHandle ); + if( imageActor ) { // A limitation here is that its possible that between creation of animation // and running it the ShaderEffect of the actor has been changed. // However this is a unlikely use case especially when using scripts. - if( ShaderEffect effect = renderable.GetShaderEffect() ) + if( ShaderEffect effect = imageActor.GetShaderEffect() ) { propIndex = effect.GetPropertyIndex( *property ); if(propIndex != Property::INVALID_INDEX)