projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge Handle & Constrainable
[platform/core/uifw/dali-core.git]
/
dali
/
public-api
/
geometry
/
animatable-mesh.cpp
diff --git
a/dali/public-api/geometry/animatable-mesh.cpp
b/dali/public-api/geometry/animatable-mesh.cpp
index
1f678f4
..
d545f35
100644
(file)
--- a/
dali/public-api/geometry/animatable-mesh.cpp
+++ b/
dali/public-api/geometry/animatable-mesh.cpp
@@
-55,7
+55,7
@@
AnimatableMesh::~AnimatableMesh()
}
AnimatableMesh::AnimatableMesh(const AnimatableMesh& handle)
-:
Constrainab
le(handle)
+:
Hand
le(handle)
{
}
@@
-93,7
+93,7
@@
Property AnimatableMesh::GetVertexProperty( unsigned int vertex, Property::Index
AnimatableMesh::AnimatableMesh( Internal::AnimatableMesh* internal )
-:
Constrainab
le(internal)
+:
Hand
le(internal)
{
}