Merge "DALi C# binding - Avoid removal of dali-swig/manual/cpp/keyboard_focus_manager...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / shader-effects / bouncing-effect.h

diff --git a/dali-toolkit/devel-api/shader-effects/bouncing-effect.h b/dali-toolkit/devel-api/shader-effects/bouncing-effect.h
index 6d74bb9..d3d3bb0 100644 (file)
--- a/dali-toolkit/devel-api/shader-effects/bouncing-effect.h
+++ b/dali-toolkit/devel-api/shader-effects/bouncing-effect.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_SHADER_EFFECT_BOUNCING_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/shader-effects/shader-effect.h>
+#include <dali/devel-api/shader-effects/shader-effect.h>
 
 namespace Dali
 {
@@ -93,7 +93,6 @@ inline ShaderEffect CreateBouncingEffect(const Vector4& color)
 
   ShaderEffect shaderEffect;
   shaderEffect = ShaderEffect::New( "", fragmentShader,
-                                    GeometryType( GEOMETRY_TYPE_IMAGE),
                                     ShaderEffect::GeometryHints( ShaderEffect::HINT_BLENDING ) );
 
   shaderEffect.SetUniform( "uAssignedColor", color );