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
Merge "Updated ImageVisual to handle native texture sampler" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-vector-image
/
vector-animation-task.cpp
diff --git
a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
index
bae4fbc
..
c5978d6
100644
(file)
--- a/
dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
+++ b/
dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.cpp
@@
-26,6
+26,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/image-visual-shader-factory.h>
#include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/image-visual-shader-factory.h>
#include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-thread.h>
+#include <dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.h>
namespace Dali
{
namespace Dali
{
@@
-52,7
+53,7
@@
VectorAnimationTask::VectorAnimationTask( VisualFactoryCache& factoryCache, cons
: mUrl( url ),
mVectorRenderer(),
mAnimationData(),
: mUrl( url ),
mVectorRenderer(),
mAnimationData(),
- mVectorAnimationThread( factoryCache.GetVectorAnimationThread() ),
+ mVectorAnimationThread( factoryCache.GetVectorAnimation
Manager().GetVectorAnimation
Thread() ),
mConditionalWait(),
mAnimationFinishedTrigger(),
mPlayState( PlayState::STOPPED ),
mConditionalWait(),
mAnimationFinishedTrigger(),
mPlayState( PlayState::STOPPED ),