X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbubble-effect%2Fbubble-actor.cpp;h=f42b72b730f6f5e0b1f522a8c2a42cf0ad24c31b;hb=e4ace0da6e0d702b90e5a70d477aa7a0e0f6f44f;hp=e1ef66caf0d0aca62ccfc1bc553a873af1054730;hpb=826aba962a524264650e83e6e0edc31ffd0bcf44;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/bubble-effect/bubble-actor.cpp b/dali-toolkit/internal/controls/bubble-effect/bubble-actor.cpp index e1ef66c..f42b72b 100644 --- a/dali-toolkit/internal/controls/bubble-effect/bubble-actor.cpp +++ b/dali-toolkit/internal/controls/bubble-effect/bubble-actor.cpp @@ -50,7 +50,7 @@ BubbleActor::BubbleActor( unsigned int numberOfBubble, mActor = Actor::New(); } -void BubbleActor::MakeRenderable( Geometry geometry, Material material ) +void BubbleActor::MakeRenderable( Geometry geometry, TextureSet textureSet, Shader shader ) { if( mRenderer ) { @@ -58,7 +58,8 @@ void BubbleActor::MakeRenderable( Geometry geometry, Material material ) return; } - mRenderer = Renderer::New( geometry, material ); + mRenderer = Renderer::New( geometry, shader ); + mRenderer.SetTextures( textureSet ); mActor.AddRenderer( mRenderer ); mActor.SetSize( mMovementArea );