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
Blend Equation Advanced Supporting
[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
b0324ed
..
ec130e2
100644
(file)
--- a/
dali-toolkit/internal/visuals/image/image-visual.cpp
+++ b/
dali-toolkit/internal/visuals/image/image-visual.cpp
@@
-543,7
+543,7
@@
void ImageVisual::CreateRenderer( TextureSet& textureSet )
}
else
{
}
else
{
- vertexShader = mImageVisualShaderFactory.GetVertexShaderSource();
+ vertexShader = mImageVisualShaderFactory.GetVertexShaderSource()
.data()
;
}
std::string fragmentShader;
}
std::string fragmentShader;
@@
-553,7
+553,7
@@
void ImageVisual::CreateRenderer( TextureSet& textureSet )
}
else
{
}
else
{
- fragmentShader = mImageVisualShaderFactory.GetFragmentShaderSource();
+ fragmentShader = mImageVisualShaderFactory.GetFragmentShaderSource()
.data()
;
}
// If the texture is native, we may need to change prefix and sampler in
}
// If the texture is native, we may need to change prefix and sampler in