Merge "Fix bug in mesh-renderer which failed to render using textureless shader"...

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / gaussian-blur-view / gaussian-blur-view-impl.h

diff --git a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h
index 9b6d564..b4b9baf 100644 (file)
--- a/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h
+++ b/dali-toolkit/internal/controls/gaussian-blur-view/gaussian-blur-view-impl.h
@@ -21,6 +21,7 @@
 // EXTERNAL INCLUDES
 #include <sstream>
 #include <cmath>
+#include <dali/public-api/object/property-map.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
@@ -166,15 +167,17 @@ private:
   FrameBufferImage mRenderTarget1;
   FrameBufferImage mRenderTarget2;
 
-  Toolkit::ImageView mImageActorHorizBlur;
-  Toolkit::ImageView mImageActorVertBlur;
+  Toolkit::ImageView mImageViewHorizBlur;
+  Toolkit::ImageView mImageViewVertBlur;
+
+  Property::Map mCustomShader;
 
   RenderTask mHorizBlurTask;
   RenderTask mVertBlurTask;
 
   /////////////////////////////////////////////////////////////
   // for compositing blur and children renders to offscreen target
-  Toolkit::ImageView mImageActorComposite;
+  Toolkit::ImageView mImageViewComposite;
   RenderTask mCompositeTask;
 
   /////////////////////////////////////////////////////////////