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
[dali_1.0.11] Merge branch 'tizen'
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
builder
/
builder-animations.cpp
diff --git
a/base/dali-toolkit/internal/builder/builder-animations.cpp
b/base/dali-toolkit/internal/builder/builder-animations.cpp
index
72911b8
..
de6b380
100644
(file)
--- a/
base/dali-toolkit/internal/builder/builder-animations.cpp
+++ b/
base/dali-toolkit/internal/builder/builder-animations.cpp
@@
-201,19
+201,19
@@
Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D
}
}
}
}
- if( OptionalString endAction = constant.IsString( IsChild(child, "d
estroy
-action" ) ) )
+ if( OptionalString endAction = constant.IsString( IsChild(child, "d
isconnect
-action" ) ) )
{
if("BAKE" == *endAction)
{
{
if("BAKE" == *endAction)
{
- animation.SetD
estroy
Action( Animation::Bake );
+ animation.SetD
isconnect
Action( Animation::Bake );
}
else if("DISCARD" == *endAction)
{
}
else if("DISCARD" == *endAction)
{
- animation.SetD
estroy
Action( Animation::Discard );
+ animation.SetD
isconnect
Action( Animation::Discard );
}
else if("BAKE_FINAL" == *endAction)
{
}
else if("BAKE_FINAL" == *endAction)
{
- animation.SetD
estroy
Action( Animation::BakeFinal );
+ animation.SetD
isconnect
Action( Animation::BakeFinal );
}
}
}
}