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 "DGEUF-110: Limit ScrollView to scroll maximum 1 page on flick" into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
renderers
/
image
/
image-renderer.cpp
diff --git
a/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp
b/dali-toolkit/internal/controls/renderers/image/image-renderer.cpp
index
b595a48
..
0fad543
100644
(file)
--- a/
dali-toolkit/internal/controls/renderers/image/image-renderer.cpp
+++ b/
dali-toolkit/internal/controls/renderers/image/image-renderer.cpp
@@
-568,18
+568,14
@@
void ImageRenderer::ApplyImageToSampler()
Material material = mImpl->mRenderer.GetMaterial();
if( material )
{
Material material = mImpl->mRenderer.GetMaterial();
if( material )
{
- for( std::size_t i = 0; i < material.GetNumberOfSamplers(); ++i )
+ int index = material.GetTextureIndex(TEXTURE_UNIFORM_NAME);
+ if( index != -1 )
{
{
- Sampler sampler = material.GetSamplerAt( i );
- if( sampler.GetUniformName() == TEXTURE_UNIFORM_NAME )
- {
- sampler.SetImage( mImage );
- return;
- }
+ material.SetTextureImage( index, mImage );
+ return;
}
}
- Sampler sampler = Sampler::New( mImage, TEXTURE_UNIFORM_NAME );
- material.AddSampler( sampler );
+ material.AddTexture( mImage,TEXTURE_UNIFORM_NAME );
}
}
}
}
}
}