X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fscrollable%2Fbouncing-effect-actor.cpp;h=177f92726ead83d9ee8df467aae4407282eedb15;hp=2583616fd49128db233dcbf25509426408b86425;hb=7f7e821222743c032bdac69f24917fe6f9cbd61a;hpb=da0b26956ee6258765ff541e1b8057557a37144b diff --git a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp index 2583616..177f927 100644 --- a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp +++ b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp @@ -19,13 +19,13 @@ #include // EXTERNAL INCLUDES -#include -#include #include -#include #include -#include -#include +#include +#include +#include +#include +#include namespace Dali { @@ -122,8 +122,7 @@ Actor CreateBouncingEffectActor( Property::Index& bouncePropertyIndex ) meshActor.AddRenderer( renderer ); // Register property - bouncePropertyIndex = meshActor.RegisterProperty("bounce-coefficient", 0.f); - meshActor.AddUniformMapping( bouncePropertyIndex, "uBounceCoefficient" ); + bouncePropertyIndex = meshActor.RegisterProperty("uBounceCoefficient", 0.f); return meshActor; }