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
bb5eab1
..
d545f35
100644
(file)
--- a/
dali/public-api/geometry/animatable-mesh.cpp
+++ b/
dali/public-api/geometry/animatable-mesh.cpp
@@
-54,6
+54,17
@@
AnimatableMesh::~AnimatableMesh()
{
}
{
}
+AnimatableMesh::AnimatableMesh(const AnimatableMesh& handle)
+: Handle(handle)
+{
+}
+
+AnimatableMesh& AnimatableMesh::operator=(const AnimatableMesh& rhs)
+{
+ BaseHandle::operator=(rhs);
+ return *this;
+}
+
unsigned int AnimatableMesh::GetNumberOfVertices() const
{
return GetImplementation(*this).GetNumberOfVertices();
unsigned int AnimatableMesh::GetNumberOfVertices() const
{
return GetImplementation(*this).GetNumberOfVertices();
@@
-82,7
+93,7
@@
Property AnimatableMesh::GetVertexProperty( unsigned int vertex, Property::Index
AnimatableMesh::AnimatableMesh( Internal::AnimatableMesh* internal )
AnimatableMesh::AnimatableMesh( Internal::AnimatableMesh* internal )
-:
Constrainab
le(internal)
+:
Hand
le(internal)
{
}
{
}