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 "update bouncing-effect-actor to use new mesh" into devel/new_mesh
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
shader-effects
/
dissolve-local-effect.cpp
diff --git
a/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp
b/dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp
index
4a6fab3
..
26430d0
100644
(file)
--- a/
dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp
+++ b/
dali-toolkit/public-api/shader-effects/dissolve-local-effect.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-108,7
+108,7
@@
DissolveLocalEffect DissolveLocalEffect::New( unsigned int numberOfDimples )
handle.SetRadius(i, 0.f);
handle.SetDistortion( i, 0.f );
}
handle.SetRadius(i, 0.f);
handle.SetDistortion( i, 0.f );
}
- handle.SetProperty( ShaderEffect::Property::G
ridDensity
, Dali::Property::Value(5.f) );
+ handle.SetProperty( ShaderEffect::Property::G
RID_DENSITY
, Dali::Property::Value(5.f) );
handle.SetTransparency( 0.5f );
return handle;
handle.SetTransparency( 0.5f );
return handle;