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
Changed Animation API enums to uppercase.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
builder
/
builder-animations.cpp
diff --git
a/dali-toolkit/internal/builder/builder-animations.cpp
b/dali-toolkit/internal/builder/builder-animations.cpp
index
beec9eb
..
c917d06
100644
(file)
--- a/
dali-toolkit/internal/builder/builder-animations.cpp
+++ b/
dali-toolkit/internal/builder/builder-animations.cpp
@@
-17,7
+17,7
@@
// EXTERNAL INCLUDES
#include <dali/public-api/actors/layer.h>
// EXTERNAL INCLUDES
#include <dali/public-api/actors/layer.h>
-#include <dali/
public-api/actors/image-actor
.h>
+#include <dali/
devel-api/common/stage
.h>
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
@@
-176,15
+176,15
@@
Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D
{
if("BAKE" == *endAction)
{
{
if("BAKE" == *endAction)
{
- animation.SetEndAction( Animation::B
ake
);
+ animation.SetEndAction( Animation::B
AKE
);
}
else if("DISCARD" == *endAction)
{
}
else if("DISCARD" == *endAction)
{
- animation.SetEndAction( Animation::D
iscard
);
+ animation.SetEndAction( Animation::D
ISCARD
);
}
else if("BAKE_FINAL" == *endAction)
{
}
else if("BAKE_FINAL" == *endAction)
{
- animation.SetEndAction( Animation::B
akeFinal
);
+ animation.SetEndAction( Animation::B
AKE_FINAL
);
}
}
}
}
@@
-192,15
+192,15
@@
Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D
{
if("BAKE" == *endAction)
{
{
if("BAKE" == *endAction)
{
- animation.SetDisconnectAction( Animation::B
ake
);
+ animation.SetDisconnectAction( Animation::B
AKE
);
}
else if("DISCARD" == *endAction)
{
}
else if("DISCARD" == *endAction)
{
- animation.SetDisconnectAction( Animation::D
iscard
);
+ animation.SetDisconnectAction( Animation::D
ISCARD
);
}
else if("BAKE_FINAL" == *endAction)
{
}
else if("BAKE_FINAL" == *endAction)
{
- animation.SetDisconnectAction( Animation::B
akeFinal
);
+ animation.SetDisconnectAction( Animation::B
AKE_FINAL
);
}
}
}
}
@@
-232,12
+232,6
@@
Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D
DALI_SCRIPT_WARNING( "Cannot find property on object\n" );
continue;
}
DALI_SCRIPT_WARNING( "Cannot find property on object\n" );
continue;
}
-
- if( propIndex == Property::INVALID_INDEX)
- {
- DALI_ASSERT_ALWAYS( propIndex != Property::INVALID_INDEX && "Animation must specify a valid property" );
- continue;
- }
}
// these are the defaults
}
// these are the defaults