X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Fbuilder-animations.cpp;h=b16235f3bc1900e871b368f67fcf2f6ee860890c;hp=980fc90748839065e5ee712fb709d67e7e3b1f95;hb=42492df08f8a079da70931292aebb56e1252641d;hpb=f3da11c2818c6d17706fbb2417f21b602b3190f5 diff --git a/dali-toolkit/internal/builder/builder-animations.cpp b/dali-toolkit/internal/builder/builder-animations.cpp index 980fc90..b16235f 100644 --- a/dali-toolkit/internal/builder/builder-animations.cpp +++ b/dali-toolkit/internal/builder/builder-animations.cpp @@ -17,7 +17,6 @@ // EXTERNAL INCLUDES #include -#include #include // INTERNAL INCLUDES @@ -229,31 +228,8 @@ Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D // to allow animating shader uniforms if( propIndex == Property::INVALID_INDEX ) { - 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 = imageActor.GetShaderEffect() ) - { - propIndex = effect.GetPropertyIndex( *property ); - if(propIndex != Property::INVALID_INDEX) - { - targetHandle = effect; - } - else - { - DALI_SCRIPT_WARNING( "Cannot find property on object or ShaderEffect\n" ); - continue; - } - } - } - else - { - DALI_SCRIPT_WARNING( "Cannot find property on object or ShaderEffect\n" ); + DALI_SCRIPT_WARNING( "Cannot find property on object\n" ); continue; - } } if( propIndex == Property::INVALID_INDEX)