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 "Fix the texture bleeding with wrapping in atlas" into devel/master
[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
f3f46d9
..
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>
// 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>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/control-impl.h>
@@
-169,6
+170,8
@@
private:
Toolkit::ImageView mImageViewHorizBlur;
Toolkit::ImageView mImageViewVertBlur;
Toolkit::ImageView mImageViewHorizBlur;
Toolkit::ImageView mImageViewVertBlur;
+ Property::Map mCustomShader;
+
RenderTask mHorizBlurTask;
RenderTask mVertBlurTask;
RenderTask mHorizBlurTask;
RenderTask mVertBlurTask;