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
/
actors
/
actor.cpp
diff --git
a/dali/public-api/actors/actor.cpp
b/dali/public-api/actors/actor.cpp
index
f3beeb8
..
f2c07d6
100644
(file)
--- a/
dali/public-api/actors/actor.cpp
+++ b/
dali/public-api/actors/actor.cpp
@@
-67,7
+67,7
@@
Actor::~Actor()
}
Actor::Actor(const Actor& copy)
-:
Constrainab
le(copy)
+:
Hand
le(copy)
{
}
@@
-610,7
+610,7
@@
DynamicsBody Actor::GetDynamicsBody()
}
Actor::Actor(Internal::Actor* internal)
-:
Constrainab
le(internal)
+:
Hand
le(internal)
{
}