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 "Increased test coverage on TextLabel and TextField" into tizen
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
shader-effects
/
dissolve-effect.cpp
diff --git
a/dali-toolkit/public-api/shader-effects/dissolve-effect.cpp
b/dali-toolkit/public-api/shader-effects/dissolve-effect.cpp
index
70d2f5c
..
c6d68af
100644
(file)
--- a/
dali-toolkit/public-api/shader-effects/dissolve-effect.cpp
+++ b/
dali-toolkit/public-api/shader-effects/dissolve-effect.cpp
@@
-106,7
+106,7
@@
DissolveEffect DissolveEffect::New( bool useHighPrecision )
Dali::Toolkit::DissolveEffect handle( shaderEffectCustom );
handle.SetUniform( DISTORTION_PROPERTY_NAME, 0.0f );
Dali::Toolkit::DissolveEffect handle( shaderEffectCustom );
handle.SetUniform( DISTORTION_PROPERTY_NAME, 0.0f );
- handle.SetProperty( ShaderEffect::
GRID_DENSITY,
Property::Value(50.0f) );
+ handle.SetProperty( ShaderEffect::
Property::GRID_DENSITY, Dali::
Property::Value(50.0f) );
handle.SetCentralLine( Vector2(1.0f,0.5f), Vector2(-1.0f, 0.0f) );
handle.SetCentralLine( Vector2(1.0f,0.5f), Vector2(-1.0f, 0.0f) );