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=a7db0d257ce33b59bf12db54912c42615fa641c5;hp=c06e40055e49d2cee29c57e35e20533b602496bd;hb=b1e8521ad77e7b4e62b59613b2edef64429130e9;hpb=24d1c5037a28d3b8e9094dbb65630687e079705a diff --git a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp index c06e400..a7db0d2 100644 --- a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp +++ b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,11 +21,10 @@ // EXTERNAL INCLUDES #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include namespace Dali { @@ -114,7 +113,7 @@ Actor CreateBouncingEffectActor( Property::Index& bouncePropertyIndex ) Property::Map vertexFormat; vertexFormat["aPosition1"] = Property::VECTOR3; vertexFormat["aPosition2"] = Property::VECTOR3; - PropertyBuffer vertices = PropertyBuffer::New( vertexFormat ); + VertexBuffer vertices = VertexBuffer::New( vertexFormat ); vertices.SetData( vertexData, 20u ); unsigned short indexData[30] = { 0,3,1,0,2,3,4,7,5,4,6,7,8,11,9,8,10,11,12,15,13,12,14,15,16,19,17,16,18,19};