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 "Remove Atlas parameter for TextureManager cache system" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
image
/
image-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/image/image-visual.cpp
b/dali-toolkit/internal/visuals/image/image-visual.cpp
index
02df28f
..
ff8d961
100644
(file)
--- a/
dali-toolkit/internal/visuals/image/image-visual.cpp
+++ b/
dali-toolkit/internal/visuals/image/image-visual.cpp
@@
-680,9
+680,9
@@
void ImageVisual::LoadTexture(bool& atlasing, Vector4& atlasRect, TextureSet& te
else
{
DALI_ASSERT_ALWAYS(mFastTrackLoadingTask->mTextures.size() >= 3u);
else
{
DALI_ASSERT_ALWAYS(mFastTrackLoadingTask->mTextures.size() >= 3u);
- textureSet.SetTexture(0u, mFastTrackLoadingTask->mTextures[0]);
- textureSet.SetTexture(1u, mFastTrackLoadingTask->mTextures[1]);
textureSet.SetTexture(2u, mFastTrackLoadingTask->mTextures[2]);
textureSet.SetTexture(2u, mFastTrackLoadingTask->mTextures[2]);
+ textureSet.SetTexture(1u, mFastTrackLoadingTask->mTextures[1]);
+ textureSet.SetTexture(0u, mFastTrackLoadingTask->mTextures[0]);
// We cannot determine what kind of shader will be used.
// Just use unified shader, and then change shader after load completed.
// We cannot determine what kind of shader will be used.
// Just use unified shader, and then change shader after load completed.