projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Property enum name changes in dali-core: Toolkit changes for compiling
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
bouncing-effect-actor.cpp
diff --git
a/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
b/dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
index
beb4b43
..
86ade19
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
+++ b/
dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.cpp
@@
-107,10
+107,10
@@
Actor CreateBouncingEffectActor( Property::Index& bouncePropertyIndex )
for( size_t i=0;i<NUM_LAYERS;i++ )
{
size_t j=i*4;
for( size_t i=0;i<NUM_LAYERS;i++ )
{
size_t j=i*4;
- mesh.ApplyConstraint( Constraint::New<Vector3>( mesh.GetPropertyIndex(j+2, AnimatableVertex::POSITION ),
+ mesh.ApplyConstraint( Constraint::New<Vector3>( mesh.GetPropertyIndex(j+2, AnimatableVertex::P
roperty::P
OSITION ),
Source(meshActor, bouncePropertyIndex),
VertexPositionConstraint(-0.5f, LAYER_HEIGHTS[i]) ) );
Source(meshActor, bouncePropertyIndex),
VertexPositionConstraint(-0.5f, LAYER_HEIGHTS[i]) ) );
- mesh.ApplyConstraint( Constraint::New<Vector3>( mesh.GetPropertyIndex(j+3, AnimatableVertex::POSITION),
+ mesh.ApplyConstraint( Constraint::New<Vector3>( mesh.GetPropertyIndex(j+3, AnimatableVertex::P
roperty::P
OSITION),
Source(meshActor, bouncePropertyIndex),
VertexPositionConstraint(-0.5f, LAYER_HEIGHTS[i]) ) );
}
Source(meshActor, bouncePropertyIndex),
VertexPositionConstraint(-0.5f, LAYER_HEIGHTS[i]) ) );
}