Merge "DALi Version 1.2.48" into devel/master

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

diff --git a/dali-toolkit/devel-api/shader-effects/image-region-effect.h b/dali-toolkit/devel-api/shader-effects/image-region-effect.h
index af2c1e9..afeba53 100644 (file)
--- a/dali-toolkit/devel-api/shader-effects/image-region-effect.h
+++ b/dali-toolkit/devel-api/shader-effects/image-region-effect.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/object/property-map.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/visuals/visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 
 namespace Dali
 {
@@ -41,7 +41,7 @@ namespace Toolkit
  *  "uBottomRight"  - The bottom-right corner of the image region. The coordinates are in percentage,
  *                    (0,0) being the top-left and (1,1) the bottom right of the original image
  *
- * @return A handle to a newly allocated ShaderEffect
+ * @return A property map of the required shader
  */
 inline Property::Map CreateImageRegionEffect()
 {
@@ -78,7 +78,7 @@ inline Property::Map CreateImageRegionEffect()
   Property::Map customShader;
   customShader[ Visual::Shader::Property::VERTEX_SHADER ] = vertexShader;
 
-  map[ Visual::Property::SHADER ] = customShader;
+  map[ DevelVisual::Property::SHADER ] = customShader;
   return map;
 }