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 branch 'devel/master' into devel/new_mesh
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
shader-effects
/
distance-field-effect.h
diff --git
a/dali-toolkit/devel-api/shader-effects/distance-field-effect.h
b/dali-toolkit/devel-api/shader-effects/distance-field-effect.h
index
3a4dba0
..
c3b2669
100644
(file)
--- a/
dali-toolkit/devel-api/shader-effects/distance-field-effect.h
+++ b/
dali-toolkit/devel-api/shader-effects/distance-field-effect.h
@@
-158,7
+158,6
@@
inline ShaderEffect CreateDistanceFieldEffect()
Dali::ShaderEffect shaderEffect = Dali::ShaderEffect::NewWithPrefix(
"", "",
fragmentShaderPrefix, fragmentShader,
Dali::ShaderEffect shaderEffect = Dali::ShaderEffect::NewWithPrefix(
"", "",
fragmentShaderPrefix, fragmentShader,
- GeometryType( GEOMETRY_TYPE_IMAGE ),
ShaderEffect::GeometryHints( ShaderEffect::HINT_BLENDING));
shaderEffect.SetUniform("uSmoothing",0.5f);
ShaderEffect::GeometryHints( ShaderEffect::HINT_BLENDING));
shaderEffect.SetUniform("uSmoothing",0.5f);