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 "Fixed doxygen error in web-view.h" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
shader-effects
/
motion-stretch-effect.cpp
diff --git
a/dali-toolkit/devel-api/shader-effects/motion-stretch-effect.cpp
b/dali-toolkit/devel-api/shader-effects/motion-stretch-effect.cpp
index
bdd21f7
..
9d736a3
100644
(file)
--- a/
dali-toolkit/devel-api/shader-effects/motion-stretch-effect.cpp
+++ b/
dali-toolkit/devel-api/shader-effects/motion-stretch-effect.cpp
@@
-24,15
+24,14
@@
#include <dali/public-api/rendering/shader.h>
// INTERNAL INCLUDES
#include <dali/public-api/rendering/shader.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/visuals/visual-properties.h>
#include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
#include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
namespace Dali
{
namespace Toolkit
{
namespace Dali
{
namespace Toolkit
{
-
-void SetMotionStretchProperties( Actor& actor )
+void SetMotionStretchProperties(Actor& actor)
{
actor.RegisterProperty("uGeometryStretchFactor", 0.5f);
actor.RegisterProperty("uSpeedScalingFactor", 0.5f);
{
actor.RegisterProperty("uGeometryStretchFactor", 0.5f);
actor.RegisterProperty("uSpeedScalingFactor", 0.5f);
@@
-63,6
+62,5
@@
Property::Map CreateMotionStretchEffect()
return map;
}
return map;
}
-
-} // Toolkit
-} // Dali
+} // namespace Toolkit
+} // namespace Dali